commit f905365e5a08570d793e134ce306d2a5a33ab326
author Andrew Cole <captaincole@google.com> Mon Mar 13 20:51:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 13 20:51:38 2023 +0000
tree 4959c11f09204f87001d052e4d67857c69b17a73
parent 887c0ae68b90cf013416a6238d2a30e44124d6d6
parent 66e5c91380041974ddb850dad75d629e9e30b11a

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

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 fef1708..f910a92 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -510,7 +510,6 @@
 
     @Test
     @PortraitLandscape
-    @ScreenRecord // (b/256659409)
     public void testUninstallFromAllApps() throws Exception {
         installDummyAppAndWaitForUIUpdate();
         try {
@@ -519,6 +518,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();
             }