From 99d2b4827d07407b9c54ada6b1d67f447d4378f3 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Tue, 5 Dec 2023 17:07:38 +0000 Subject: [PATCH] Revert "Update isLauncherInitialized check to wait until Launcher has stopped binding items" This reverts commit 7ab2c874c92263d4c17671060573739ee3dd6922. Reason for revert: Likely culprit for b/311366267 Change-Id: I52a2c7527a90698866aef44217230ef7ae5064ee --- .../android/launcher3/testing/TestInformationHandler.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index c95653d061..0438e575c6 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.Flags.enableGridOnlyOverview; import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST; +import static com.android.launcher3.Flags.enableGridOnlyOverview; import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -288,10 +288,8 @@ public class TestInformationHandler implements ResourceBasedOverride { } protected boolean isLauncherInitialized() { - Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedActivity(); - return launcher == null - || (LauncherAppState.getInstance(mContext).getModel().isModelLoaded() - && !launcher.isBindingItems()); + return Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null + || LauncherAppState.getInstance(mContext).getModel().isModelLoaded(); } protected Activity getCurrentActivity() {