commit 18b2da5f07e6d71d1707df97e27d3a3fc7634bb8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 28 21:11:43 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 28 21:11:43 2020 +0000
tree acbaeeda167d3885154a34be7b3c9db48ae11ab7
parent a39544d562625270ce75a76cbdde1e69a83f9351
parent 2e6fdd7d93c7f480d88c77c717ab3359677943b0

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

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

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index debc736..d46845f 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -535,13 +535,14 @@
                 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);