commit d6519668bfb90b3aa3c0ee953ccb3e78cfd975eb
author Winson Chung <winsonc@google.com> Fri Feb 16 03:23:51 2018 +0000
committer Winson Chung <winsonc@google.com> Fri Feb 16 03:23:51 2018 +0000
tree 2d57af95d059c2b5b75b900e6cf7c014de3e4865
parent 73aa3025c0001e58c57d009053dee03c0108ca3e

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

This reverts commit 73aa3025c0001e58c57d009053dee03c0108ca3e.

Reason for revert: Post-drop revert

Change-Id: Ife752d26e07d9c064c938ff8d33d40457b54217a

src/com/android/launcher3/LauncherModel.java

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