Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff70e24a authored by Andrew Cole's avatar Andrew Cole Committed by Automerger Merge Worker
Browse files

Merge "Asking the test to wait for launcher to commit the uninstall... 

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

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



Change-Id: Id12ff32a78dc4a6b53578473b94af9e3dfd33184
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b38b550 f905365e

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -510,7 +510,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 




    @Test

    @Test

    @PortraitLandscape

    @PortraitLandscape

    @ScreenRecord // (b/256659409)

    public void testUninstallFromAllApps() throws Exception {

    public void testUninstallFromAllApps() throws Exception {

        installDummyAppAndWaitForUIUpdate();

        installDummyAppAndWaitForUIUpdate();

        try {

        try {
@@ -519,6 +518,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
            allApps.freeze();

            allApps.freeze();

            try {

            try {

                workspace = allApps.getAppIcon(DUMMY_APP_NAME).uninstall();

                workspace = allApps.getAppIcon(DUMMY_APP_NAME).uninstall();

                // After the toast clears, then the model tries to commit the uninstall transaction

                mLauncher.waitForModelQueueCleared();

            } finally {

            } finally {

                allApps.unfreeze();

                allApps.unfreeze();

            }

            }