From da1359f12f6c5d9e8f9b0a6e45ecd80ee9bdc2ac Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Mon, 25 Apr 2022 15:03:38 -0700 Subject: [PATCH] Unmark ExitPipViaIntent flaky for shell-transitions statusBarlayerRotatesScales is still flaky for legacy, so I split those up. Bug: 227006499 Test: atest WMShellFlickerTests:ExitPipViaIntentTest Change-Id: I3129303f854e9fae743421d8bb94fbba0422665f --- .../wm/shell/flicker/pip/ExitPipViaIntentTest.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 37e9344348d98..c6a705dacb8da 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 @@ -80,7 +80,17 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit /** {@inheritDoc} */ @FlakyTest(bugId = 206753786) @Test - override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() + override fun statusBarLayerRotatesScales() { + Assume.assumeFalse(isShellTransitionsEnabled) + super.statusBarLayerRotatesScales() + } + + @Presubmit + @Test + fun statusBarLayerRotatesScales_ShellTransit() { + Assume.assumeTrue(isShellTransitionsEnabled) + super.statusBarLayerRotatesScales() + } /** {@inheritDoc} */ @FlakyTest(bugId = 197726610)