Merge "Disable failing app launch assertion on shell transitions" into tm-dev am: 77e8e3599a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884329 Change-Id: Ic79852c3e21435fa79733f6ee1dc41efeea9b4a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -154,6 +154,21 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter)
|
|||||||
super.appWindowReplacesLauncherAsTopWindow()
|
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 {
|
companion object {
|
||||||
/**
|
/**
|
||||||
* Creates the test configurations.
|
* Creates the test configurations.
|
||||||
|
|||||||
Reference in New Issue
Block a user