commit ce0c9d4a12d0586599a32720ae44412be81f743e
author Andrew Cole <captaincole@google.com> Mon Mar 13 22:03:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 13 22:03:37 2023 +0000
tree f314ecd8f4c0fe8b7ef86190583da1eeabd66752
parent 64fadf8fba16899a29c113d1b65ccd45da316ad0
parent ff70e24a50b46523d6107ac69b8a0daf1dc0602e

Merge "Asking the test to wait for launcher to commit the uninstall transaction before opening all apps." into tm-qpr-dev am: f905365e5a am: ff70e24a50

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21961037

Change-Id: I52bf2e754f24cf086f1d0281dbfbc2cd5232a9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 228f57d..ae12861 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -520,7 +520,6 @@
 
     @Test
     @PortraitLandscape
-    @ScreenRecord // (b/256659409)
     public void testUninstallFromAllApps() throws Exception {
         installDummyAppAndWaitForUIUpdate();
         try {
@@ -529,6 +528,8 @@
             allApps.freeze();
             try {
                 workspace = allApps.getAppIcon(DUMMY_APP_NAME).uninstall();
+                // After the toast clears, then the model tries to commit the uninstall transaction
+                mLauncher.waitForModelQueueCleared();
             } finally {
                 allApps.unfreeze();
             }