From 60d3333ff01a85f3cafc09d7adbb400479388e34 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 8 May 2020 09:29:08 -0700
Subject: [PATCH] Adding waiting for Launcher initialization

This may fix or ease TIS sometimes not receiving events.

Bug: 154157191
Change-Id: I5db9e88397788014dbba9716d777a2b97347828c
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java   | 1 +
 .../tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 160daef636..192e69fed0 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -297,6 +297,7 @@ public abstract class AbstractLauncherUiTest {
             clearPackageData(mDevice.getLauncherPackageName());
             mLauncher.enableDebugTracing();
             mLauncherPid = mLauncher.getPid();
+            mLauncher.waitForLauncherInitialized();
         }
     }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 240f5154a9..667e2d4fe8 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -625,6 +625,7 @@ public final class LauncherInstrumentation {
         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