Merge "Optimization: reducing number of getNavigationModeMismatchError calls" into ub-launcher3-rvc-dev

2020-04-28 21:11:43 +00:00
parent a39544d562 2e6fdd7d93
commit 18b2da5f07
1 changed files with 4 additions and 3 deletions
@@ -535,13 +535,14 @@ public final class LauncherInstrumentation {
                mExpectedRotation, mDevice.getDisplayRotation());

        // b/148422894
+        String error = null;
        for (int i = 0; i != 600; ++i) {
-            if (getNavigationModeMismatchError() == null) break;
+            error = getNavigationModeMismatchError();
+            if (error == null) break;
            sleep(100);
        }
-
-        final String error = getNavigationModeMismatchError();
        assertTrue(error, error == null);
+
        log("verifyContainerType: " + containerType);

        final UiObject2 container = verifyVisibleObjects(containerType);