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

Commit b86ef3fb authored Feb 16, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Feb 16, 2018

Merge "Revert "Revert "Synchronizing loader preload to avoid launcher getting...

Merge "Revert "Revert "Synchronizing loader preload to avoid launcher getting stuck in loading state,""" into ub-launcher3-master

parents 19a3906e d6519668

src/com/android/launcher3/LauncherModel.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -493,6 +493,15 @@ public class LauncherModel extends BroadcastReceiver
		}
		}

		public void startLoaderForResultsIfNotLoaded(LoaderResults results) {
		synchronized (mLock) {
		if (!isModelLoaded()) {
		Log.d(TAG, "Workspace not loaded, loading now");
		startLoaderForResults(results);
		}
		}
		}

		/**
		* Loads the workspace screen ids in an ordered list.
		*/

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -49,11 +49,8 @@ public class ModelPreload implements ModelUpdateTask {

		@Override
		public final void run() {
		if (!mModel.isModelLoaded()) {
		Log.d(TAG, "Workspace not loaded, loading now");
		mModel.startLoaderForResults(
		mModel.startLoaderForResultsIfNotLoaded(
		new LoaderResults(mApp, mBgDataModel, mAllAppsList, 0, null));
		}
		Log.d(TAG, "Preload completed : " + mModel.isModelLoaded());
		onComplete(mModel.isModelLoaded());
		}