commit 4f51725717dd9b8f54a46f0450936ce3f11c14df
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 08 21:26:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 21:26:30 2020 +0000
tree 3c1c5cf811a80d0a1fc192ba5d1ffcec483c369d
parent 144f638fa38567e7ea90cfc4d28e51061dfe40dd
parent 60d3333ff01a85f3cafc09d7adbb400479388e34

Merge "Adding waiting for Launcher initialization" into ub-launcher3-rvc-dev

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 160daef..192e69f 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -297,6 +297,7 @@
             clearPackageData(mDevice.getLauncherPackageName());
             mLauncher.enableDebugTracing();
             mLauncherPid = mLauncher.getPid();
+            mLauncher.waitForLauncherInitialized();
         }
     }
 

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 7e344c2..a57e9d9 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -625,6 +625,7 @@
         mInstrumentation.getUiAutomation().setOnAccessibilityEventListener(
                 e -> Log.d("b/155926212", e.toString()));
         try (LauncherInstrumentation.Closable e = eventsCheck()) {
+            waitForLauncherInitialized();
             // Click home, then wait for any accessibility event, then wait until accessibility
             // events stop.
             // We need waiting for any accessibility event generated after pressing Home because