Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f796ae1c authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update isLauncherInitialized check to wait until Launcher has... 

Merge "Revert "Update isLauncherInitialized check to wait until Launcher has stopped binding items"" into main
parents 8d07e2f8 99d2b482

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

+3 −5
Original line number Diff line number Diff line
@@ -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;
@@ -297,10 +297,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() {