From 5070363c876116f33fe650dbd0652aad30fbe09c Mon Sep 17 00:00:00 2001
From: Nataniel Borges <natanieljr@google.com>
Date: Thu, 21 Apr 2022 11:12:19 +0200
Subject: [PATCH] Disable failing app launch assertion on shell transitions

Bug: 229738092
Test: atest FlickerTests:OpenImeWindowToOverViewTest
Change-Id: I03c28017a8bcd58af197f0d144f3a141a978f698
---
 .../wm/flicker/launch/OpenAppFromOverviewTest.kt  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 18f077f241de6..2226fd1d2155e 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
@@ -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.