commit 70607cfe0a57570b1676ecd9f5e2de7d49550596
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 07 01:10:23 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 07 01:10:23 2020 +0000
tree 34e1d10bcf8a73dc48fd3a09d5f7a8bb723b5bd6
parent b3ea58d582f5ca3553799c069635616e0932402d
parent ec9c109c46a5558ba0bf3391b25cc3bdf72f1640

Merge "Attempt to workaround navigation mode mismatch errors" into ub-launcher3-master

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 83e1b38..5eb164e 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -490,6 +490,12 @@
         assertEquals("Unexpected display rotation",
                 mExpectedRotation, mDevice.getDisplayRotation());
 
+        // b/149024111
+        for (int i = 0; i != 100; ++i) {
+            if (getNavigationModeMismatchError() == null) break;
+            sleep(100);
+        }
+
         final String error = getNavigationModeMismatchError();
         assertTrue(error, error == null);
         log("verifyContainerType: " + containerType);