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

Commit 73aa3025 authored Feb 16, 2018 by Winson Chung

Revert "Synchronizing loader preload to avoid launcher getting stuck in loading state,"

This reverts commit a1b4911e.

Reason for revert: Temporary revert for NL build

Change-Id: I81527681bd00d49e590a99e238f4d57e5a619d16

parent a1b4911e

src/com/android/launcher3/LauncherModel.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -493,15 +493,6 @@ 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

+5 −2

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

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