diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index a4d188f159..929606e4a4 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -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. */ diff --git a/src/com/android/launcher3/model/ModelPreload.java b/src/com/android/launcher3/model/ModelPreload.java index f186e9572d..6f33bedb0e 100644 --- a/src/com/android/launcher3/model/ModelPreload.java +++ b/src/com/android/launcher3/model/ModelPreload.java @@ -49,8 +49,11 @@ public class ModelPreload implements ModelUpdateTask { @Override public final void run() { - mModel.startLoaderForResultsIfNotLoaded( - new LoaderResults(mApp, mBgDataModel, mAllAppsList, 0, null)); + 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()); }