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

Commit d8181f4d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing workarounds for a fixed bug" into ub-launcher3-master

parents 9ae44d6c 4bc691b9

quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class NavigationModeSwitchRule implements TestRule { 
                    SYS_UI_NAVIGATION_MODE.removeModeChangeListener(listener));



            Wait.atMost(() -> "Navigation mode didn't change to " + expectedMode,

                    () -> currentSysUiNavigationMode() == expectedMode, 60000 /* b/148422894 */,

                    () -> currentSysUiNavigationMode() == expectedMode, WAIT_TIME_MS,

                    launcher);

            // b/139137636

//            assertTrue(launcher, "Navigation mode didn't change to " + expectedMode,
@@ -202,7 +202,7 @@ public class NavigationModeSwitchRule implements TestRule { 
        Wait.atMost(() -> "Switching nav mode: "

                        + launcher.getNavigationModeMismatchError(),

                () -> launcher.getNavigationModeMismatchError() == null,

                60000 /* b/148422894 */, launcher);

                WAIT_TIME_MS, launcher);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher);

        return true;

    }

tests/src/com/android/launcher3/util/rule/FailureInvestigator.java

+0 −6
Original line number Diff line number Diff line
@@ -87,12 +87,6 @@ class FailureInvestigator { 
            return 145935261;

        }



        if (matches("java\\.lang\\.AssertionError\\: http\\:\\/\\/go\\/tapl \\: want to get "

                + "workspace object; Presence of recents button doesn't match the interaction "

                + "mode, mode\\=ZERO_BUTTON, hasRecents\\=true", exception)) {

            return 148422894;

        }



        final String logSinceBoot;

        try {

            final String systemBootTime =

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+1 −7
Original line number Diff line number Diff line
@@ -549,13 +549,7 @@ public final class LauncherInstrumentation { 
        assertEquals("Unexpected display rotation",

                mExpectedRotation, mDevice.getDisplayRotation());



        // b/148422894

        String error = null;

        for (int i = 0; i != 600; ++i) {

            error = getNavigationModeMismatchError();

            if (error == null) break;

            sleep(100);

        }

        final String error = getNavigationModeMismatchError();

        assertTrue(error, error == null);



        log("verifyContainerType: " + containerType);