commit 6f92e2e365daccbb84f5ddf101124f2adb1330e1
author Tongfei Guo <tongfei@google.com> Thu Sep 19 15:41:48 2019 -0700
committer Tongfei Guo <tongfei@google.com> Thu Dec 05 22:17:55 2019 +0000
tree ca55ee7f8f96e5a3e9b8174440c7727842735c1c
parent eb4915845716a662ad8539d3d4b2e9ca9864a783

Bugfix, add extra wait when searching in app grid.

Bug: 141328109
Test: build and run test
Change-Id: I91d96b04c4329b5f2d6d30bef94f2c5287b5e8f3
(cherry picked from commit c113ce054525856092a77e67c22d154251418f40)

libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java

diff --git a/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java b/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
index dcbe7e1..c547f0d 100644
--- a/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
+++ b/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
@@ -338,11 +338,11 @@
                 mDevice.waitForIdle();
             }
 
-            UiObject2 app = mDevice.findObject(appSelector);
+            UiObject2 app = mDevice.wait(Until.findObject(appSelector), UI_WAIT_TIMEOUT);
             while (app == null && down.isEnabled()) {
                 down.click();
                 mDevice.waitForIdle();
-                app = mDevice.findObject(appSelector);
+                app = mDevice.wait(Until.findObject(appSelector), UI_WAIT_TIMEOUT);
             }
             return app;
         } else {