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

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

Merge "Increasing nav mode settlement timeout as an attempt to workaround nav... 

Merge "Increasing nav mode settlement timeout as an attempt to workaround nav mode mismatch bug." into ub-launcher3-master
parents 8c2f22e5 c71db987

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

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ public class NavigationModeSwitchRule implements TestRule { 


        Wait.atMost(() -> "Switching nav mode: "

                        + launcher.getNavigationModeMismatchError(),

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

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

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



        return true;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ public final class LauncherInstrumentation { 
        assertEquals("Unexpected display rotation",

                mExpectedRotation, mDevice.getDisplayRotation());



        // b/149024111

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

        // b/148422894

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

            if (getNavigationModeMismatchError() == null) break;

            sleep(100);

        }