diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-02-23 15:12:42 -0800 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-02-23 15:12:42 -0800 |
commit | f28629a47b5fcd9532683e9c9ad7aad049e0106d (patch) | |
tree | 17f8775a097018c4d88bc24c53324ced1ac4e76b | |
parent | f55ad3d411b404f81324a27cc56ce988942e034e (diff) | |
download | android_packages_apps_Trebuchet-f28629a47b5fcd9532683e9c9ad7aad049e0106d.tar.gz android_packages_apps_Trebuchet-f28629a47b5fcd9532683e9c9ad7aad049e0106d.tar.bz2 android_packages_apps_Trebuchet-f28629a47b5fcd9532683e9c9ad7aad049e0106d.zip |
Ignore tasks if the LauncherModel is still pending.
The tasks will be enqueued after the model is loaded when it
gets to the final state.
Bug: 31509386
Change-Id: Id72aaedb025a91a49b25e1ef103cc1976d603b21
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 40bd3d43e..590c24263 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1800,6 +1800,12 @@ public class LauncherModel extends BroadcastReceiver } 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); } |