Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dd45bc5 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Unmark ExitPipViaIntent flaky for shell-transitions" into tm-qpr-dev... 

Merge "Unmark ExitPipViaIntent flaky for shell-transitions" into tm-qpr-dev am: 692e5f7d am: 529149c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946853



Change-Id: Ib47ad1f37abb5ffc203b859f87ee3e568a111471
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9062402e 529149c4

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+11 −1
Original line number Diff line number Diff line
@@ -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)