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

Commit b37fc7a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable failing app launch assertion on shell transitions" into tm-dev am: 77e8e359 

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



Change-Id: I7d36bab8cf0db21ab6f6f79f01ce1e73d399e0dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 524c0913 77e8e359

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt

+15 −0
Original line number Diff line number Diff line
@@ -154,6 +154,21 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) 
        super.appWindowReplacesLauncherAsTopWindow()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appWindowBecomesTopWindow() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.appWindowBecomesTopWindow()

    }



    @FlakyTest(bugId = 229738092)

    @Test

    fun appWindowBecomesTopWindow_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.appWindowBecomesTopWindow()

    }



    companion object {

        /**

         * Creates the test configurations.