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

Commit 6598fab1 authored by Andrew Cole's avatar Andrew Cole Committed by Android (Google) Code Review
Browse files

Merge "Improving a flakey uninstall from allapps test." into udc-dev

parents 3d877d3b 78e14617

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

+6 −8
Original line number Diff line number Diff line
@@ -525,14 +525,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        try {

            Workspace workspace = mLauncher.getWorkspace();

            final HomeAllApps allApps = workspace.switchToAllApps();

            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();

            }

            waitForLauncherUIUpdate();

            verifyAppUninstalledFromAllApps(workspace, DUMMY_APP_NAME);

        } finally {

            TestUtil.uninstallDummyApp();
@@ -633,6 +627,10 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


    private void installDummyAppAndWaitForUIUpdate() throws IOException {

        TestUtil.installDummyApp();

        waitForLauncherUIUpdate();

    }



    private void waitForLauncherUIUpdate() {

        // Wait for model thread completion as it may be processing

        // the install event from the SystemService

        mLauncher.waitForModelQueueCleared();