commit bd83aead359b2e85e10ab1b9a242d5bda9704d8e
author James O'Leary <jamesoleary@google.com> Tue Oct 22 18:40:49 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 22 18:40:49 2019 +0000
tree 6ee29b23eef81d4dcb059a7232edd676496c9d68
parent 3b78d08109cf1b2e37ffe06ad6e89b9e01bf666b
parent 9e57e740054b1c31f517134507dbbf996678cb44

Merge "QuickCaptureInputConsumer -> OverscrollInputConsumer + plugin" 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 41a4bdb..484cbb6 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -497,9 +497,7 @@
     }
 
     public void waitForLauncherInitialized() {
-        // b/136278866
-        final int attempts = android.os.Build.MODEL.contains("Cuttlefish") ? 600 : 100;
-        for (int i = 0; i < attempts; ++i) {
+        for (int i = 0; i < 100; ++i) {
             if (getTestInfo(
                     TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED).
                     getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD)) {