Merge "Check for stopped state after launching AlwaysExpandActivity over the main activity in addition to paused" into main

2023-07-25 15:40:02 +00:00
parent 57b63f6a3d 3249255e42
commit bde2afa877
1 changed files with 5 additions and 2 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt
@@ -171,12 +171,15 @@ constructor(
        wmHelper
            .StateSyncBuilder()
            .withActivityState(ALWAYS_EXPAND_ACTIVITY_COMPONENT, PlatformConsts.STATE_RESUMED)
-            .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_PAUSED)
+            .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_PAUSED,
+                PlatformConsts.STATE_STOPPED)
            .waitForAndVerify()
    }

    private fun launchSecondaryActivityFromButton(
-            wmHelper: WindowManagerStateHelper, buttonName: String) {
+        wmHelper: WindowManagerStateHelper,
+        buttonName: String
+    ) {
        val launchButton =
                uiDevice.wait(Until.findObject(By.res(getPackage(), buttonName)), FIND_TIMEOUT)
        require(launchButton != null) {