commit 1bba868612fa6307327ca2cbddd48b42d5fe2ab8
author Jon Miranda <jonmiranda@google.com> Thu Feb 23 23:28:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 23 23:28:57 2017 +0000
tree 17f8775a097018c4d88bc24c53324ced1ac4e76b
parent 0ced17017ddb871ba98399a268a8c2658d5f3ff3
parent f28629a47b5fcd9532683e9c9ad7aad049e0106d

Ignore tasks if the LauncherModel is still pending.
am: f28629a47b

Change-Id: I528620c0e662ac35004c3929b002c6c5c1823cc0

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 40bd3d4..590c242 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1800,6 +1800,12 @@
     }
 
     void enqueueModelUpdateTask(BaseModelUpdateTask task) {
+        if (!mModelLoaded && mLoaderTask == null) {
+            if (DEBUG_LOADERS) {
+                Log.d(TAG, "enqueueModelUpdateTask Ignoring task since loader is pending=" + task);
+            }
+            return;
+        }
         task.init(this);
         runOnWorkerThread(task);
     }