commit ff70e24a50b46523d6107ac69b8a0daf1dc0602e
author Andrew Cole <captaincole@google.com> Mon Mar 13 21:27:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 13 21:27:06 2023 +0000
tree 2e984b23b7f0411f5655dc116883faf421c741d2
parent 4b38b550f5d0193a7ab16fd4c9321c125daab6c6
parent f905365e5a08570d793e134ce306d2a5a33ab326

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

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

Change-Id: Id12ff32a78dc4a6b53578473b94af9e3dfd33184
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 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();
             }