commit 73aa3025c0001e58c57d009053dee03c0108ca3e
author Winson Chung <winsonc@google.com> Fri Feb 16 02:42:33 2018 +0000
committer Winson Chung <winsonc@google.com> Fri Feb 16 02:42:33 2018 +0000
tree 25ea1c8560d2aaecad23a398f6cc635d05400231
parent a1b4911e2606c5b9f36d0692f0bd0856c6e24683

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

This reverts commit a1b4911e2606c5b9f36d0692f0bd0856c6e24683.

Reason for revert: Temporary revert for NL build

Change-Id: I81527681bd00d49e590a99e238f4d57e5a619d16

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a4d188f..929606e 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -493,15 +493,6 @@
         }
     }
 
-    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

diff --git a/src/com/android/launcher3/model/ModelPreload.java b/src/com/android/launcher3/model/ModelPreload.java
index f186e95..6f33bed 100644
--- a/src/com/android/launcher3/model/ModelPreload.java
+++ b/src/com/android/launcher3/model/ModelPreload.java
@@ -49,8 +49,11 @@
 
     @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());
     }