Merge "Wait until notification pop up is gone" into main

2023-07-24 18:16:48 +00:00
parent 0b69edface 3d088d84c2
commit 90a49af20a
1 changed files with 4 additions and 1 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromNotificationWarmTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromNotificationWarmTest.kt
@@ -67,7 +67,10 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) :
                wmHelper.StateSyncBuilder().withFullScreenApp(testApp).waitForAndVerify()
                testApp.postNotification(wmHelper)
                device.pressHome()
-                wmHelper.StateSyncBuilder().withHomeActivityVisible().waitForAndVerify()
+                wmHelper.StateSyncBuilder()
+                    .withHomeActivityVisible()
+                    .withWindowSurfaceDisappeared(ComponentNameMatcher.NOTIFICATION_SHADE)
+                    .waitForAndVerify()
            }

            transitions {