Merge "Wait for both window and layer to be visible and window to be pinned before considering the app in pip mode" into udc-dev

2023-04-20 22:51:04 +00:00
parent 978d51f0c4 2c6492d62b
commit 56216f2649
1 changed files with 4 additions and 1 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt
@@ -250,7 +250,10 @@ open class PipAppHelper(instrumentation: Instrumentation) :
            waitConditions = arrayOf(ConditionsFactory.hasPipWindow())
        )

-        wmHelper.StateSyncBuilder().withPipShown().waitForAndVerify()
+        wmHelper.StateSyncBuilder()
+            .withWindowSurfaceAppeared(this)
+            .withPipShown()
+            .waitForAndVerify()
    }

    /** Expand the PIP window back to full screen via intent and wait until the app is visible */