From a7eea562fb42d52fe81a4e3631f924c91b663fc4 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 6 Sep 2019 12:55:43 -0700
Subject: [PATCH] Fix test bug where launcher throws NPE because it isnt loaded
 yet.

Bug: 140635319
Change-Id: Iea90c6816c670d58acf79114fc725602ddc9d0b1
---
 tests/src/com/android/launcher3/compat/PromiseIconUiTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
index 7ef946d4c4..efbd9c99c3 100644
--- a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
+++ b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java
@@ -48,6 +48,7 @@ public class PromiseIconUiTest extends AbstractLauncherUiTest {
     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;
     }