commit e8ec58f90f2c24b9388dd4941e7dd5c5dbd0e9ab
author Winson Chung <winsonc@google.com> Fri Feb 16 03:04:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 16 03:04:34 2018 +0000
tree d5b26c42a02fbae7d371b82195de12aa1b425590
parent 6485766bd14c3cc7132a65094559462fffa1040b
parent 73aa3025c0001e58c57d009053dee03c0108ca3e

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

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());
     }