diff options
| author | vadimt <vadimt@google.com> | 2019-09-27 18:44:04 -0700 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2019-10-01 19:18:14 +0000 |
| commit | 7371e4da6846e532592ac14f3a9ab12576a29a1c (patch) | |
| tree | 3bcdde0ab587c8df826368ee5424e515f9b34237 /src/com | |
| parent | 7cb5b73dfb86c56ea7e20a60f819e88549710717 (diff) | |
| download | android_packages_apps_Trebuchet-7371e4da6846e532592ac14f3a9ab12576a29a1c.tar.gz android_packages_apps_Trebuchet-7371e4da6846e532592ac14f3a9ab12576a29a1c.tar.bz2 android_packages_apps_Trebuchet-7371e4da6846e532592ac14f3a9ab12576a29a1c.zip | |
Waiting for Launcher model load in out-of-proc tests.
Not doing this seems to have caused flakes.
Bug: 141770616
Change-Id: Ia9caf20e4a2d93298adf4249ca815ad79bced802
Merged-in: Ia9caf20e4a2d93298adf4249ca815ad79bced802
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/testing/TestInformationHandler.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index 790a2e844..9965572bd 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java @@ -27,6 +27,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; +import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherState; import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.R; @@ -82,7 +83,7 @@ public class TestInformationHandler implements ResourceBasedOverride { } case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: { - response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true); + response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, isLauncherInitialized()); break; } @@ -152,4 +153,9 @@ public class TestInformationHandler implements ResourceBasedOverride { } return response; } + + protected boolean isLauncherInitialized() { + final LauncherModel model = LauncherAppState.getInstance(mContext).getModel(); + return model.getCallback() == null || model.isModelLoaded(); + } }
\ No newline at end of file |