Merge "Make sure TAPL waits for Launcher activity to stop each time it stops" into main

2024-02-03 02:33:53 +00:00
parent 379b5b0467 dd33b64a64
commit f9eced5768
6 changed files with 53 additions and 2 deletions
@@ -599,6 +599,9 @@ public abstract class AbstractLauncherUiTest {
        Wait.atMost("Launcher activity didn't stop",
                () -> !launcherInstrumentation.isLauncherActivityStarted(),
                DEFAULT_ACTIVITY_TIMEOUT, launcherInstrumentation);
+
+        // Reset activity stop count.
+        launcherInstrumentation.getAndResetActivityStopCount();
    }

    public static ActivityInfo resolveSystemAppInfo(String category) {