From 2152b04520f2dcd3c35ee16e1a9d4c93f75e824d Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Tue, 19 Dec 2023 13:09:17 -0800
Subject: [PATCH] Wait for RecentsActivity to stop after dismissing all tasks

Bug: 313926097
Flag: N/A
Test: presubmit
Change-Id: I9afc27d4096417acaa1d4fb39de08b2a1ed8712a
---
 .../tests/src/com/android/quickstep/FallbackRecentsTest.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index e0ee28dc02..880f3af205 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -223,6 +223,10 @@ public class FallbackRecentsTest {
 
     private void pressHomeAndWaitForOverviewClose() {
         mDevice.pressHome();
+        waitForRecentsActivityStop();
+    }
+
+    private void waitForRecentsActivityStop() {
         Wait.atMost("Recents activity didn't stop",
                 () -> getFromRecents(recents -> !recents.isStarted()),
                 DEFAULT_UI_TIMEOUT, mLauncher);
@@ -276,6 +280,7 @@ public class FallbackRecentsTest {
 
         // 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));
     }