Merge "Don't run tests with maxSdkVersion = 33 on pre-release Android U" into androidx-main
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
index cc606eb..8ed530e 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
@@ -70,6 +70,10 @@
@UiThreadTest
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testVectorDrawableAutoMirrored() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Activity activity = mActivityTestRule.getActivity();
ImageView view1 = (ImageView) activity.findViewById(R.id.view_vector_1);
Drawable vectorDrawable = view1.getDrawable();
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
index 0b38fe6..f126833 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
@@ -47,12 +47,13 @@
@Test
@MediumTest
- @SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
+ @SdkSuppress(minSdkVersion = 24, // O+ uses navigation clusters for jumping to ActionBar.
+ maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testAccessActionBar() throws Throwable {
- // Since O, we rely on keyboard navigation clusters for jumping to actionbar
- if (Build.VERSION.SDK_INT <= 25) {
- return;
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
}
+
final BaseTestActivity activity = mActivityTestRule.getActivity();
final View editText = activity.findViewById(androidx.appcompat.test.R.id.editText);
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesSyncToFrameworkTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesSyncToFrameworkTestCase.kt
index ac32070..536e283 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesSyncToFrameworkTestCase.kt
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesSyncToFrameworkTestCase.kt
@@ -21,6 +21,7 @@
import android.content.ComponentName
import android.content.Intent
import android.content.pm.PackageManager
+import android.os.Build
import android.os.LocaleList
import androidx.appcompat.testutils.LocalesActivityTestRule
import androidx.appcompat.testutils.LocalesUtils.CUSTOM_LOCALE_LIST
@@ -77,6 +78,10 @@
@Test
fun testAutoSync_preTToPostT_syncsSuccessfully() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val firstActivity = rule.activity
// activity is following the system and the requested locales are null.
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt
index 11e05a2..d07329e 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt
@@ -16,6 +16,7 @@
package androidx.appcompat.app
+import android.os.Build
import android.util.LayoutDirection.RTL
import android.webkit.WebView
import androidx.appcompat.testutils.LocalesActivityTestRule
@@ -123,6 +124,10 @@
@Test
@FlakyTest(bugId = 255765202)
fun testLayoutDirectionAfterRecreating() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
setLocalesAndWaitForRecreate(rule, getRTLLocaleList())
// Now assert that the layoutDirection of decorView is RTL
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
index 6d15a0d..f8eb993 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
@@ -16,6 +16,7 @@
package androidx.benchmark.macro.perfetto
+import android.os.Build
import androidx.benchmark.macro.FileLinkingRule
import androidx.benchmark.macro.Packages
import androidx.benchmark.perfetto.PerfettoCapture
@@ -64,12 +65,24 @@
@Ignore("b/258216025")
@SdkSuppress(minSdkVersion = LOWEST_BUNDLED_VERSION_SUPPORTED, maxSdkVersion = 33)
@Test
- fun captureAndValidateTrace_bundled() = captureAndValidateTrace(unbundled = false)
+ fun captureAndValidateTrace_bundled() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
+ captureAndValidateTrace(unbundled = false)
+ }
@Ignore("b/258216025")
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
- fun captureAndValidateTrace_unbundled() = captureAndValidateTrace(unbundled = true)
+ fun captureAndValidateTrace_unbundled() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
+ captureAndValidateTrace(unbundled = true)
+ }
private fun captureAndValidateTrace(unbundled: Boolean) {
assumeTrue(isAbiSupported())
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkTraceTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkTraceTest.kt
index 4d0e75b..02ffea2 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkTraceTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkTraceTest.kt
@@ -66,6 +66,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun test_endToEnd() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
assumeTrue(PerfettoHelper.isAbiSupported())
StringSource.appTagTraceStrings.forEach { trace(it) { } }
StringSource.userspaceTraceStrings.forEachIndexed { ix, str ->
diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/VideoCaptureDeviceTest.kt b/camera/camera-view/src/androidTest/java/androidx/camera/view/VideoCaptureDeviceTest.kt
index 1c2f921..a63882a 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/VideoCaptureDeviceTest.kt
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/VideoCaptureDeviceTest.kt
@@ -435,6 +435,10 @@
@Test
@SdkSuppress(minSdkVersion = 21, maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun canRecordToFile_whenPauseAndResumeInTheMiddle() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val pauseTimes = 1
val resumeTimes = 1
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
index 2564e4b..a1d1b2f 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTest.kt
@@ -16,6 +16,7 @@
package androidx.compose.foundation
+import android.os.Build
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.gestures.draggable
@@ -209,6 +210,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_clickWithEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -237,6 +242,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_clickWithNumPadEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -265,6 +274,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_clickWithDPadCenter() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -1277,6 +1290,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_interactionSource_focus_inKeyboardMode() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
lateinit var scope: CoroutineScope
@@ -1926,6 +1943,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_enterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1972,6 +1993,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_numPadEnterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -2018,6 +2043,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_dpadCenter_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -2100,6 +2129,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_doubleEnterKey_emitsFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -2160,6 +2193,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_repeatKeyEvents_doNotEmitFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -2219,6 +2256,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun clickableTest_interruptedClick_emitsCancelIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/SelectableTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/SelectableTest.kt
index 179bbd1..a4a49a9 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/SelectableTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/SelectableTest.kt
@@ -16,6 +16,7 @@
package androidx.compose.foundation.selection
+import android.os.Build
import androidx.compose.foundation.TapIndicationDelay
import androidx.compose.foundation.interaction.FocusInteraction
import androidx.compose.foundation.interaction.HoverInteraction
@@ -531,6 +532,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_interactionSource_focus_inKeyboardMode() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
lateinit var scope: CoroutineScope
@@ -633,6 +638,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_clickWithEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -661,6 +670,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_clickWithNumPadEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -689,6 +702,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_clickWithDPadCenter() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
var counter = 0
val focusRequester = FocusRequester()
@@ -717,6 +734,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_enterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -764,6 +785,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_numPadEnterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -811,6 +836,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_dpadCenter_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -895,6 +924,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_doubleEnterKey_emitsFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -956,6 +989,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_repeatKeyEvents_doNotEmitFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1018,6 +1055,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun selectableTest_interruptedClick_emitsCancelIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/ToggleableTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/ToggleableTest.kt
index 38d0d22..f48a9ee 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/ToggleableTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/selection/ToggleableTest.kt
@@ -16,6 +16,7 @@
package androidx.compose.foundation.selection
+import android.os.Build
import androidx.compose.foundation.TapIndicationDelay
import androidx.compose.foundation.interaction.FocusInteraction
import androidx.compose.foundation.interaction.HoverInteraction
@@ -623,6 +624,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_interactionSource_focus_inKeyboardMode() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
lateinit var scope: CoroutineScope
@@ -824,6 +829,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_clickWithEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val focusRequester = FocusRequester()
var toggled by mutableStateOf(false)
@@ -853,6 +862,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_clickWithNumPadEnterKey() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val focusRequester = FocusRequester()
var toggled by mutableStateOf(false)
@@ -882,6 +895,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_clickWithDpadCenter() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val focusRequester = FocusRequester()
var toggled by mutableStateOf(false)
@@ -911,6 +928,10 @@
@OptIn(ExperimentalTestApi::class, ExperimentalComposeUiApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_clickWithEnterKey_triStateToggleable() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val focusRequester = FocusRequester()
var toggled by mutableStateOf(false)
@@ -940,6 +961,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_enterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -987,6 +1012,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_numPadEnterKey_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1034,6 +1063,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_dpadCenter_emitsIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1118,6 +1151,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_doubleEnterKey_emitsFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1179,6 +1216,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_repeatKeyEvents_doNotEmitFurtherInteractions() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
@@ -1239,6 +1280,10 @@
@OptIn(ExperimentalComposeUiApi::class, ExperimentalTestApi::class)
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun toggleableTest_interruptedClick_emitsCancelIndication() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().setInTouchMode(false)
val interactionSource = MutableInteractionSource()
val focusRequester = FocusRequester()
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/InputModeTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/InputModeTest.kt
index 1c940a9..9a5fc62 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/InputModeTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/InputModeTest.kt
@@ -16,6 +16,7 @@
package androidx.compose.ui.input
+import android.os.Build
import android.view.View
import androidx.compose.foundation.layout.Box
import androidx.compose.runtime.Composable
@@ -56,6 +57,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun initialInputMode() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
// Arrange.
rule.setContentWithInputManager {
Box {}
@@ -68,6 +73,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun switchToTouchModeProgrammatically() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
// Arrange.
rule.setContentWithInputManager {
Box {}
@@ -97,6 +106,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun switchToKeyboardModeProgrammatically() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
// Arrange.
val testTag = "Box"
rule.setContentWithInputManager {
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/window/DialogTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/window/DialogTest.kt
index 1f5e56a..4f60fb3 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/window/DialogTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/window/DialogTest.kt
@@ -15,6 +15,7 @@
*/
package androidx.compose.ui.window
+import android.os.Build
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -269,6 +270,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun dialogTest_backHandler_isCalled_backButtonPressed() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val clickCountPrefix = "Click: "
rule.setContent {
diff --git a/core/core-appdigest/src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java b/core/core-appdigest/src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java
index c261bc9..5da3a24 100644
--- a/core/core-appdigest/src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java
+++ b/core/core-appdigest/src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java
@@ -271,6 +271,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34 // b/262909049: Failing on SDK 34
public void testDefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Checksum[] checksums = getChecksums(V2V3_PACKAGE_NAME, true, 0, TRUST_NONE);
assertNotNull(checksums);
if (Build.VERSION.SDK_INT >= 31) {
@@ -294,6 +298,10 @@
@LargeTest
@Test
public void testSplitsDefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installSplits(new String[]{TEST_V4_APK, TEST_V4_SPLIT0, TEST_V4_SPLIT1, TEST_V4_SPLIT2,
TEST_V4_SPLIT3, TEST_V4_SPLIT4});
assertTrue(isAppInstalled(V4_PACKAGE_NAME));
@@ -337,6 +345,10 @@
@LargeTest
@Test
public void testSplitsSha256Checksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installSplits(new String[]{TEST_V4_APK, TEST_V4_SPLIT0, TEST_V4_SPLIT1, TEST_V4_SPLIT2,
TEST_V4_SPLIT3, TEST_V4_SPLIT4});
assertTrue(isAppInstalled(V4_PACKAGE_NAME));
@@ -434,6 +446,10 @@
@LargeTest
@Test
public void testFixedDefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installPackage(TEST_FIXED_APK);
assertTrue(isAppInstalled(FIXED_PACKAGE_NAME));
@@ -467,6 +483,10 @@
@LargeTest
@Test
public void testFixedV1DefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installPackage(TEST_FIXED_APK_V1);
assertTrue(isAppInstalled(FIXED_PACKAGE_NAME));
@@ -492,6 +512,10 @@
@LargeTest
@Test
public void testFixedSha512DefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installPackage(TEST_FIXED_APK_V2_SHA512);
assertTrue(isAppInstalled(FIXED_PACKAGE_NAME));
@@ -527,6 +551,10 @@
@LargeTest
@Test
public void testFixedVerityDefaultChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installPackage(TEST_FIXED_APK_VERITY);
assertTrue(isAppInstalled(FIXED_PACKAGE_NAME));
@@ -748,6 +776,10 @@
@LargeTest
@Test
public void testInstallerChecksumsTrustNone() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installApkWithChecksums(NO_SIGNATURE);
Checksum[] checksums = getChecksums(FIXED_PACKAGE_NAME, true, 0, TRUST_NONE);
@@ -774,6 +806,10 @@
@LargeTest
@Test
public void testInstallerChecksumsTrustAll() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
installApkWithChecksums(NO_SIGNATURE);
final Certificate certificate = InstallerApi31.getInstallerCertificate(mContext);
@@ -839,6 +875,10 @@
@LargeTest
@Test
public void testInstallerSignedChecksums() throws Exception {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
final byte[] signature = InstallerApi31.readSignature();
final Certificate certificate = InstallerApi31.readCertificate();
diff --git a/core/core-i18n/src/androidTest/java/androidx/core/i18n/CheckTheJavaApisTest.java b/core/core-i18n/src/androidTest/java/androidx/core/i18n/CheckTheJavaApisTest.java
index f64ccb0..23fa07b 100644
--- a/core/core-i18n/src/androidTest/java/androidx/core/i18n/CheckTheJavaApisTest.java
+++ b/core/core-i18n/src/androidTest/java/androidx/core/i18n/CheckTheJavaApisTest.java
@@ -34,6 +34,7 @@
import androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year;
import androidx.core.os.BuildCompat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.platform.app.InstrumentationRegistry;
@@ -85,7 +86,12 @@
}
@Test @SmallTest
+ @SdkSuppress(maxSdkVersion = 33) // b/262909049: Do not run this test on pre-release Android U.
public void testSkeletonOptions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
final DateTimeFormatterSkeletonOptions.Builder builder =
new DateTimeFormatterSkeletonOptions.Builder()
.setYear(Year.NUMERIC)
diff --git a/core/core-i18n/src/androidTest/java/androidx/core/i18n/DateTimeFormatterCommonOptionsTest.kt b/core/core-i18n/src/androidTest/java/androidx/core/i18n/DateTimeFormatterCommonOptionsTest.kt
index 3237217..265f46b 100644
--- a/core/core-i18n/src/androidTest/java/androidx/core/i18n/DateTimeFormatterCommonOptionsTest.kt
+++ b/core/core-i18n/src/androidTest/java/androidx/core/i18n/DateTimeFormatterCommonOptionsTest.kt
@@ -23,12 +23,12 @@
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
import java.util.Calendar
import java.util.GregorianCalendar
import java.util.Locale
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
/** Must execute on an Android device. */
@RunWith(AndroidJUnit4::class)
@@ -40,7 +40,12 @@
)
@Test @SmallTest
+ @SdkSuppress(maxSdkVersion = 33) // b/262909049: Do not run this test on pre-release Android U.
fun test() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val commonFormats = mapOf(
DateTimeFormatterCommonOptions.ABBR_MONTH_WEEKDAY_DAY to "Sun, Sep 19",
DateTimeFormatterCommonOptions.ABBR_MONTH_DAY to "Sep 19",
diff --git a/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java b/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
index ae48994..64702c0 100644
--- a/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
+++ b/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
@@ -33,6 +33,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
+import android.os.Build;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.SystemClock;
@@ -876,6 +877,10 @@
@Test
@SdkSuppress(minSdkVersion = 33, maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testDurationScaleChangeListener() throws InterruptedException {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
final SpringAnimation anim = new SpringAnimation(mView1, DynamicAnimation.Y, 0f);
final CountDownLatch registerUnregisterLatch = new CountDownLatch(2);
diff --git a/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt b/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
index b696e9f..a6e3653 100644
--- a/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
+++ b/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
@@ -572,6 +572,10 @@
@Ignore("b/262903415")
@SdkSuppress(minSdkVersion = 29, maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun testTransactionSetBuffer_singleReleaseCallback() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val releaseLatch = CountDownLatch(1)
val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
.moveToState(
@@ -633,6 +637,10 @@
@Test
@SdkSuppress(minSdkVersion = 29, maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun testTransactionSetBuffer_multipleReleaseCallbacksAndOverwriteWithSingleSC() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val releaseLatch = CountDownLatch(1)
val releaseLatch2 = CountDownLatch(1)
val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
diff --git a/leanback/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java b/leanback/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
index b37673c..1db3f5e 100644
--- a/leanback/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
+++ b/leanback/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
@@ -429,6 +429,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void navigateBetweenRowsAndVideoUsingDPAD1() throws Throwable {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
navigateBetweenRowsAndVideoUsingDPADInternal(DetailsSupportFragmentWithVideo1.class);
}
@@ -436,6 +440,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void navigateBetweenRowsAndVideoUsingDPAD2() throws Throwable {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
navigateBetweenRowsAndVideoUsingDPADInternal(DetailsSupportFragmentWithVideo2.class);
}
diff --git a/leanback/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java b/leanback/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
index bfb79b2..66a6632 100644
--- a/leanback/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
+++ b/leanback/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.os.Build;
import android.view.KeyEvent;
import androidx.leanback.app.GuidedStepFragment;
@@ -387,6 +388,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testCheckedActions() throws Throwable {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Intent intent = new Intent();
Resources res = mContext.getResources();
diff --git a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
index 514e31a..99ce2e6 100644
--- a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
+++ b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
+import android.os.Build;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
@@ -44,6 +45,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void defaultFocus() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Context context = ApplicationProvider.getApplicationContext();
final ControlBar bar = new ControlBar(context, null);
final TextView v1 = new Button(context);
@@ -66,6 +71,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void persistFocus() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Context context = ApplicationProvider.getApplicationContext();
final LinearLayout rootView = new LinearLayout(context);
final ControlBar bar = new ControlBar(context, null);
@@ -109,6 +118,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void getFocusables() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Context context = ApplicationProvider.getApplicationContext();
final LinearLayout rootView = new LinearLayout(context);
final ControlBar bar = new ControlBar(context, null);
diff --git a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
index 7da8bab..9cb7606 100644
--- a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
+++ b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
@@ -30,6 +30,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.View;
@@ -272,6 +273,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void navigateProgressUpToPrimary() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
@@ -291,6 +296,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void navigateProgressDownToSecondary() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
@@ -323,6 +332,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekAndConfirm() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(0L);
when(mImpl.getDuration()).thenReturn(20000L);
@@ -352,6 +365,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void playSeekToZero() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(0L);
when(mImpl.getDuration()).thenReturn(20000L);
@@ -395,6 +412,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void playSeekAndCancel() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(0L);
when(mImpl.getDuration()).thenReturn(20000L);
@@ -438,6 +459,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekHoldKeyDown() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(4489L);
when(mImpl.getDuration()).thenReturn(20000L);
@@ -465,6 +490,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekAndCancel() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(0L);
when(mImpl.getDuration()).thenReturn(20000L);
@@ -494,6 +523,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekUpBetweenTwoKeyPosition() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -519,6 +552,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekDownBetweenTwoKeyPosition() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -545,6 +582,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekDownOutOfKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(1000L, 10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -575,6 +616,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekDownAheadOfKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(1000L, 10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -603,6 +648,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekUpAheadOfKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(1000L, 10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -631,6 +680,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekUpOutOfKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -665,6 +718,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekUpAfterKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -692,6 +749,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void seekDownAfterKeyPositions() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PlaybackSeekProviderSample provider = Mockito.spy(
new PlaybackSeekProviderSample(10000L, 101));
final long[] positions = provider.getSeekPositions();
@@ -719,6 +780,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void thumbLoadedInCallback() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
when(mImpl.isPrepared()).thenReturn(true);
when(mImpl.getCurrentPosition()).thenReturn(0L);
when(mImpl.getDuration()).thenReturn(20000L);
diff --git a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
index 3670c3a..8cee2be 100644
--- a/leanback/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
+++ b/leanback/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.content.Intent;
+import android.os.Build;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
@@ -440,6 +441,10 @@
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testInitiallyActiveTimePicker()
throws Throwable {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Intent intent = new Intent();
intent.putExtra(TimePickerActivity.EXTRA_LAYOUT_RESOURCE_ID,
R.layout.timepicker_alone);
diff --git a/slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
index 1c6b91b..ec1a3eb 100644
--- a/slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
+++ b/slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
@@ -36,6 +36,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ProviderInfo;
import android.net.Uri;
+import android.os.Build;
import androidx.annotation.NonNull;
import androidx.slice.render.SliceRenderActivity;
@@ -110,8 +111,12 @@
}
@Test
- @SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
+ @SdkSuppress(minSdkVersion = 19, maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testPinList() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
Uri uri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(mContext.getPackageName())
diff --git a/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/MultiWindowTest.java b/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/MultiWindowTest.java
index 2974a4c..3f0f1f5 100644
--- a/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/MultiWindowTest.java
+++ b/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/MultiWindowTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
+import android.os.Build;
import android.os.SystemClock;
import androidx.test.filters.LargeTest;
@@ -89,6 +90,10 @@
@Test
@SdkSuppress(minSdkVersion = 32)
public void testMultiWindow_splitScreen() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
// Launch two split-screen activities with different IDs.
launchTestActivity(SplitScreenTestActivity.class);
SystemClock.sleep(TRANSITION_DELAY_MS); // Wait for the windows to settle.
diff --git a/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/UiDeviceTest.java b/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/UiDeviceTest.java
index f314dcd..05186fc 100644
--- a/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/UiDeviceTest.java
+++ b/test/uiautomator/integration-tests/testapp/src/androidTest/java/androidx/test/uiautomator/testapp/UiDeviceTest.java
@@ -24,6 +24,7 @@
import android.app.UiAutomation;
import android.graphics.Point;
+import android.os.Build;
import android.os.SystemClock;
import android.view.KeyEvent;
import android.widget.TextView;
@@ -445,6 +446,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testWaitForWindowUpdate() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
launchTestActivity(WaitTestActivity.class);
// Returns false when the current window doesn't have the specified package name.
diff --git a/text/text/src/androidTest/java/androidx/compose/ui/text/android/FontPaddingTest.kt b/text/text/src/androidTest/java/androidx/compose/ui/text/android/FontPaddingTest.kt
index 550fb6f..f7e466f 100644
--- a/text/text/src/androidTest/java/androidx/compose/ui/text/android/FontPaddingTest.kt
+++ b/text/text/src/androidTest/java/androidx/compose/ui/text/android/FontPaddingTest.kt
@@ -18,6 +18,7 @@
import android.graphics.Typeface
import android.text.TextPaint
+import android.os.Build
import androidx.core.content.res.ResourcesCompat
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
@@ -182,6 +183,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun tallTypefaceTextIsTwiceTheHeightOfLatinTypefaceTextMultiLine() {
+ if (Build.VERSION.SDK_INT == 33 && Build.VERSION.CODENAME != "REL") {
+ return // b/262909049: Do not run this test on pre-release Android U.
+ }
+
val latinLayout = TextLayout(latinTextMultiLine, typeface = latinTypeface)
val tallLayout = TextLayout(tallTextMultiLine, typeface = tallTypeface)
diff --git a/work/work-runtime/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java b/work/work-runtime/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
index 4d9b724c..ec2f13a 100644
--- a/work/work-runtime/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
+++ b/work/work-runtime/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
@@ -1600,6 +1600,10 @@
@SuppressWarnings("unchecked")
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testCancelAllWork_updatesLastCancelAllTimeLiveData() throws InterruptedException {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
PreferenceUtils preferenceUtils = new PreferenceUtils(mWorkManagerImpl.getWorkDatabase());
preferenceUtils.setLastCancelAllTimeMillis(0L);
diff --git a/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java b/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
index b9442eef..2c2aced 100644
--- a/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
+++ b/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
@@ -25,6 +25,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
+import android.os.Build;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -52,6 +53,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testSetAlarm_noPreExistingAlarms() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
OneTimeWorkRequest work = new OneTimeWorkRequest.Builder(TestWorker.class).build();
insertWork(work);
WorkGenerationalId workSpecId = generationalId(work.getWorkSpec());
@@ -64,6 +69,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testSetAlarm_withPreExistingAlarms() {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
OneTimeWorkRequest work = new OneTimeWorkRequest.Builder(TestWorker.class).build();
insertWork(work);
WorkGenerationalId workSpecId = generationalId(work.getWorkSpec());
diff --git a/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java b/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
index e1edd07..6419d8d 100644
--- a/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
+++ b/work/work-runtime/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
@@ -37,6 +37,7 @@
import android.content.Context;
import android.content.Intent;
+import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
@@ -205,6 +206,10 @@
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
public void testSchedule() throws InterruptedException {
+ if (Build.VERSION.SDK_INT == 33 && !"REL".equals(Build.VERSION.CODENAME)) {
+ return; // b/262909049: Do not run this test on pre-release Android U.
+ }
+
OneTimeWorkRequest work = new OneTimeWorkRequest.Builder(TestWorker.class)
.setLastEnqueueTime(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
.setInitialDelay(TimeUnit.HOURS.toMillis(1), TimeUnit.MILLISECONDS)
