commit a74612611df6b60f2c45d1e4fab6840869a6ad75
author Schneider Victor-tulias <victortulias@google.com> Mon Dec 04 20:02:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 04 20:02:10 2023 +0000
tree f43a017bb989383e3abb040060fbbff800c97dee
parent 21eeda4cc3b9f3889ba3043f7783b209f77814bb
parent 7ab2c874c92263d4c17671060573739ee3dd6922

Merge "Update isLauncherInitialized check to wait until Launcher has stopped binding items" into main

src/com/android/launcher3/testing/TestInformationHandler.java

diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java
index 1b1d347..40bb6ad 100644
--- a/src/com/android/launcher3/testing/TestInformationHandler.java
+++ b/src/com/android/launcher3/testing/TestInformationHandler.java
@@ -15,8 +15,8 @@
  */
 package com.android.launcher3.testing;
 
-import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
 import static com.android.launcher3.Flags.enableGridOnlyOverview;
+import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
 import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
@@ -297,8 +297,10 @@
     }
 
     protected boolean isLauncherInitialized() {
-        return Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null
-                || LauncherAppState.getInstance(mContext).getModel().isModelLoaded();
+        Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedActivity();
+        return launcher == null
+                || (LauncherAppState.getInstance(mContext).getModel().isModelLoaded()
+                && !launcher.isBindingItems());
     }
 
     protected Activity getCurrentActivity() {