commit 52a4bc76e9489d7d8f2dfe4a65eb8d79a089c090
author Vadim Tryshev <vadimt@google.com> Tue Dec 19 22:37:22 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 19 22:37:22 2023 +0000
tree 2d83605c8515016f66fc34c6b43def3ea625ece6
parent 57b240ca02ca46e12276a18dd7563ff7f0fdcd4d
parent 2152b04520f2dcd3c35ee16e1a9d4c93f75e824d

Merge "Wait for RecentsActivity to stop after dismissing all tasks" into main

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 2fe9bfc..0a325ac 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -225,6 +225,10 @@
 
     private void pressHomeAndWaitForOverviewClose() {
         mDevice.pressHome();
+        waitForRecentsActivityStop();
+    }
+
+    private void waitForRecentsActivityStop() {
         Wait.atMost("Recents activity didn't stop",
                 () -> getFromRecents(recents -> !recents.isStarted()),
                 DEFAULT_UI_TIMEOUT, mLauncher);
@@ -278,6 +282,7 @@
 
         // Test dismissing all tasks.
         pressHomeAndGoToOverview().dismissAllTasks();
+        waitForRecentsActivityStop(); // dismissAllTasks() will close Recents
         assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
                 mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS));
     }