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

Commit 9dfbb0ac authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing pending tasks being queued on bind after the pending executor is... 

Merge "Fixing pending tasks being queued on bind after the pending executor is already finalized." into main
parents 8e24505d f0925fdf

src/com/android/launcher3/model/BaseLauncherBinder.java

+4 −3
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ public abstract class BaseLauncherBinder { 
            Executor pendingExecutor = pendingTasks::add;

            bindWorkspaceItems(otherWorkspaceItems, pendingExecutor);

            bindAppWidgets(otherAppWidgets, pendingExecutor);



            StringCache cacheClone = mBgDataModel.stringCache.clone();

            executeCallbacksTask(c -> c.bindStringCache(cacheClone), pendingExecutor);



            executeCallbacksTask(c -> c.finishBindingItems(currentScreenIds), pendingExecutor);

            pendingExecutor.execute(

                    () -> {
@@ -319,9 +323,6 @@ public abstract class BaseLauncherBinder { 
                        c.onInitialBindComplete(

                                currentScreenIds, pendingTasks, workspaceItemCount, isBindSync);

                    }, mUiExecutor);



            StringCache cacheClone = mBgDataModel.stringCache.clone();

            executeCallbacksTask(c -> c.bindStringCache(cacheClone), pendingExecutor);

        }



        private void bindWorkspaceItems(