commit 4be6169d4ea464ac6c62c26621088c8c6b7c342d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 14 17:49:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 17:49:41 2019 +0000
tree e3024831f30ef4ed29848bad81feaa4abf5e5e74
parent 4009493f3c6ea3592bcf3730f21fbe821d4899e4
parent a7eea562fb42d52fe81a4e3631f924c91b663fc4

Merge "Fix test bug where launcher throws NPE because it isnt loaded yet." into ub-launcher3-master

tests/src/com/android/launcher3/compat/PromiseIconUiTest.java

diff --git a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
index 7ef946d..efbd9c9 100644
--- a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
+++ b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
@@ -48,6 +48,7 @@
     public void setUp() throws Exception {
         super.setUp();
         mDevice.pressHome();
+        waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);
         waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);
         mSessionId = -1;
     }