From b876fb200d1022325f788cd4c4dbe1aad78a6d3c Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Wed, 22 Dec 2021 11:54:16 +0100 Subject: [PATCH] Add support to newer devices on flicker tests Some of the assertions used in flicker worked in older devices but not on newer ones. Disable these assertions and make flicker tests compatible with notch to run on newer devices Bug: 206753786 Test: atest FlickerTests WMShellFlickerTests Change-Id: Idf889506d767c4743938ee6727cd228b29873e66 --- ...AppPairsTestCannotPairNonResizeableApps.kt | 2 +- ...AppPairsTestPairPrimaryAndSecondaryApps.kt | 2 +- ...ppPairsTestSupportPairNonResizeableApps.kt | 2 +- ...pPairsTestUnpairPrimaryAndSecondaryApps.kt | 2 +- .../RotateTwoLaunchedAppsInAppPairsMode.kt | 5 +++ ...oLaunchedAppsRotateAndEnterAppPairsMode.kt | 5 +++ .../LegacySplitScreenToLauncher.kt | 2 +- .../ResizeLegacySplitScreen.kt | 1 + ...RotateOneLaunchedAppAndEnterSplitScreen.kt | 2 +- .../RotateOneLaunchedAppInSplitScreenMode.kt | 2 +- ...RotateTwoLaunchedAppAndEnterSplitScreen.kt | 3 +- .../RotateTwoLaunchedAppInSplitScreenMode.kt | 2 +- .../wm/shell/flicker/pip/EnterPipTest.kt | 2 +- .../pip/EnterPipToOtherOrientationTest.kt | 2 +- .../pip/ExitPipViaExpandButtonClickTest.kt | 4 +-- .../shell/flicker/pip/ExitPipViaIntentTest.kt | 3 +- .../pip/ExitPipWithDismissButtonTest.kt | 3 +- .../flicker/pip/ExitPipWithSwipeDownTest.kt | 3 +- .../flicker/pip/ExpandPipOnDoubleClickTest.kt | 4 +++ .../pip/MovePipDownShelfHeightChangeTest.kt | 4 +-- .../pip/MovePipUpShelfHeightChangeTest.kt | 4 +-- .../wm/shell/flicker/pip/PipKeyboardTest.kt | 3 +- .../flicker/pip/PipLegacySplitScreenTest.kt | 2 +- .../wm/shell/flicker/pip/PipRotationTest.kt | 2 +- .../SetRequestedOrientationWhilePinnedTest.kt | 2 +- .../flicker/close/CloseAppBackButtonTest.kt | 2 +- .../flicker/close/CloseAppHomeButtonTest.kt | 2 +- .../ime/CloseImeAutoOpenWindowToAppTest.kt | 3 +- .../ime/CloseImeAutoOpenWindowToHomeTest.kt | 3 +- .../wm/flicker/ime/CloseImeWindowToAppTest.kt | 2 +- .../flicker/ime/CloseImeWindowToHomeTest.kt | 3 +- .../wm/flicker/ime/OpenImeWindowTest.kt | 3 +- .../wm/flicker/ime/ReOpenImeWindowTest.kt | 2 +- .../wm/flicker/launch/OpenAppColdTest.kt | 2 +- .../flicker/launch/OpenAppFromOverviewTest.kt | 2 +- .../launch/OpenAppNonResizeableTest.kt | 2 +- .../wm/flicker/launch/OpenAppWarmTest.kt | 2 +- .../QuickSwitchBetweenTwoAppsForwardTest.kt | 33 +++++++++++-------- .../flicker/rotation/ChangeAppRotationTest.kt | 2 +- 39 files changed, 78 insertions(+), 53 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt index d9b7277ac2e8e..ae92366fb1618 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt @@ -82,7 +82,7 @@ class AppPairsTestCannotPairNonResizeableApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt index 20a94750021db..f1b01352c9bc3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt @@ -67,7 +67,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt index 2d47027bf4596..6998cd276edc9 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt @@ -86,7 +86,7 @@ class AppPairsTestSupportPairNonResizeableApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt index 9b4506c63e4d9..7a53224eb2b5d 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt @@ -71,7 +71,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt index 10ccd6a9560f6..f2f4877a44c43 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.apppairs import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -92,6 +93,10 @@ class RotateTwoLaunchedAppsInAppPairsMode( testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation, secondaryApp.component) + @FlakyTest(bugId = 206753786) + @Test + override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt index cf7343bf6326a..2a173d16004f2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.apppairs import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -79,6 +80,10 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( @Test override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible() + @FlakyTest(bugId = 206753786) + @Test + override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + @Presubmit @Test fun bothAppWindowsVisible() { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt index 77fb101acc6a4..2c02d2c183c64 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt @@ -110,7 +110,7 @@ class LegacySplitScreenToLauncher( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt index 6041e231330bb..0448ec8f2135b 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt @@ -135,6 +135,7 @@ class ResizeLegacySplitScreen( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt index e44d7d642cc61..5678899dbbaed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt @@ -77,7 +77,7 @@ class RotateOneLaunchedAppAndEnterSplitScreen( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt index d33d92bef884b..c2edf9dd5db2f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt @@ -76,7 +76,7 @@ class RotateOneLaunchedAppInSplitScreenMode( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt index ece68dfc956d5..777998c99e755 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -85,7 +86,7 @@ class RotateTwoLaunchedAppAndEnterSplitScreen( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt index 127301fa67e40..914b11d515297 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt @@ -91,7 +91,7 @@ class RotateTwoLaunchedAppInSplitScreenMode( @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt index f3a3db1c23dcf..0cbfc92151037 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt @@ -91,7 +91,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt index f923a23992cb5..fa9fbcd53ed11 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt @@ -119,7 +119,7 @@ class EnterPipToOtherOrientationTest( * Checks that the [FlickerComponentName.STATUS_BAR] has the correct position at * the start and end of the transition */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt index 4d63d14c77da0..2231d8864f14a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt @@ -16,8 +16,8 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -80,7 +80,7 @@ class ExitPipViaExpandButtonClickTest( } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt index 19d8671984f52..fcac2c782d07f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -100,7 +99,7 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt index 338687fd09390..c75076d00574d 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -96,7 +95,7 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt index 40be21af009c3..8e6603b3cc302 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -80,7 +79,7 @@ class ExitPipWithSwipeDownTest(testSpec: FlickerTestParameter) : ExitPipTransiti @Test override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible() - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt index 3511cc23c94d0..cba677b6f1d12 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt @@ -165,6 +165,10 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition } } + @FlakyTest(bugId = 206753786) + @Test + override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + companion object { /** * Creates the test configurations. diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt index 10a542f6c19af..7ed0c49346863 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt @@ -16,8 +16,8 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -83,7 +83,7 @@ class MovePipDownShelfHeightChangeTest( } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt index cb6ba0e6f70e8..56c09498f2ba5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt @@ -16,8 +16,8 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -83,7 +83,7 @@ class MovePipUpShelfHeightChangeTest( } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt index 81ac10fa90787..62e230f8c4398 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -73,7 +74,7 @@ class PipKeyboardTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt index 70075dda56ed7..e3f544ab0fab2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt @@ -90,7 +90,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt index 16fc0489fbc80..19a5935c50f8a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt @@ -107,7 +107,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) /** * Checks the position of the status bar at the start and end of the transition */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index 3121218c7c372..dbd3d8cde42a5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -115,7 +115,7 @@ class SetRequestedOrientationWhilePinnedTest( super.navBarLayerRotatesAndScales() } - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt index 7076a07c8ef67..8de38f633818e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt @@ -83,7 +83,7 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt index b5d01ef24f237..22acc03af6b6b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt @@ -82,7 +82,7 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt index f12e4aeea4bee..56879c90006eb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -154,7 +155,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index 0529fdd08fb37..c28466c485e9d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -156,7 +157,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt index d975cf40657b6..c7f1b99329fbe 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt @@ -132,7 +132,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { testSpec.navBarLayerRotatesAndScales() } - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index facca9479da93..46ed0ad88d31c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -149,7 +150,7 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index 3ef4e4c375ad8..ebe4be2b437fe 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -20,6 +20,7 @@ import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -127,7 +128,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index 84e78ec40b29e..f6e5adc2309b2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -217,7 +217,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 32feccda0c476..eef7b57ff4b26 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -81,7 +81,7 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 53b53547707a0..aac481215f81a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -98,7 +98,7 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt index 3914ef6633b38..6e5c600eb141f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt @@ -188,7 +188,7 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerPositionAtEnd() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 619f5d218a147..dfa8f8ea1ac97 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -85,7 +85,7 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt index 8f8951b7379f5..01fce054393de 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt @@ -31,7 +31,6 @@ import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.NonResizeableAppHelper import com.android.server.wm.flicker.helpers.SimpleAppHelper -import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.flicker.navBarLayerIsVisible import com.android.server.wm.flicker.navBarLayerRotatesAndScales @@ -39,6 +38,7 @@ import com.android.server.wm.flicker.navBarWindowIsVisible import com.android.server.wm.flicker.statusBarLayerIsVisible import com.android.server.wm.flicker.statusBarWindowIsVisible import com.android.server.wm.traces.common.FlickerComponentName +import com.android.server.wm.traces.common.Rect import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -68,8 +68,6 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara private val testApp1 = SimpleAppHelper(instrumentation) private val testApp2 = NonResizeableAppHelper(instrumentation) - private val startDisplayBounds = WindowUtils.getDisplayBounds(testSpec.startRotation) - @FlickerBuilderProvider fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { @@ -81,15 +79,20 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara testApp2.launchViaIntent(wmHelper) wmHelper.waitForFullScreenApp(testApp2.component) + startDisplayBounds = wmHelper.currentState.layerState + .displays.firstOrNull { !it.isVirtual } + ?.layerStackSpace + ?: error("Display not found") + // Swipe right from bottom to quick switch back // NOTE: We don't perform an edge-to-edge swipe but instead only swipe in the middle // as to not accidentally trigger a swipe back or forward action which would result // in the same behavior but not testing quick swap. device.swipe( - startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - 2 * startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, + startDisplayBounds.right / 3, + startDisplayBounds.bottom, + 2 * startDisplayBounds.right / 3, + startDisplayBounds.bottom, if (testSpec.isLandscapeOrSeascapeAtStart) 75 else 30 ) @@ -103,10 +106,10 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara // as to not accidentally trigger a swipe back or forward action which would result // in the same behavior but not testing quick swap. device.swipe( - 2 * startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, + 2 * startDisplayBounds.right / 3, + startDisplayBounds.bottom, + startDisplayBounds.right / 3, + startDisplayBounds.bottom, if (testSpec.isLandscapeOrSeascapeAtStart) 75 else 30 ) @@ -133,7 +136,8 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara // This test doesn't work in shell transitions because of b/209936664 Assume.assumeFalse(isShellTransitionsEnabled) testSpec.assertWmStart { - this.frameRegion(testApp1.component).coversExactly(startDisplayBounds) + this.frameRegion(testApp1.component, FlickerComponentName.LETTERBOX) + .coversExactly(startDisplayBounds) } } @@ -188,7 +192,8 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara // This test doesn't work in shell transitions because of b/209936664 Assume.assumeFalse(isShellTransitionsEnabled) testSpec.assertLayersEnd { - this.visibleRegion(testApp2.component).coversExactly(startDisplayBounds) + this.visibleRegion(testApp2.component, FlickerComponentName.LETTERBOX) + .coversExactly(startDisplayBounds) } } @@ -372,6 +377,8 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara } companion object { + private var startDisplayBounds = Rect.EMPTY + @Parameterized.Parameters(name = "{0}") @JvmStatic fun getParams(): Collection { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt index c18798f0a4b08..0879b98031bb3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt @@ -165,7 +165,7 @@ class ChangeAppRotationTest( /** * Checks the position of the status bar at the start and end of the transition */ - @Presubmit + @FlakyTest(bugId = 206753786) @Test fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786