diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-19 16:24:27 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-27 09:54:07 -0700 |
| commit | 22aa3813f818e46a096fef6490db2a60f2617eb7 (patch) | |
| tree | 2c6e98e7a672743b1106cfddbfff66ad991ffc9d /src/com/android | |
| parent | 20884fdc8d08129618e77ef08a1e85c42af88413 (diff) | |
| download | android_packages_apps_Trebuchet-22aa3813f818e46a096fef6490db2a60f2617eb7.tar.gz android_packages_apps_Trebuchet-22aa3813f818e46a096fef6490db2a60f2617eb7.tar.bz2 android_packages_apps_Trebuchet-22aa3813f818e46a096fef6490db2a60f2617eb7.zip | |
Pending bind callbacks should be cleared before starting the loader,
similar to startBinding
Bug: 23310446
Bug: 19422965
Bug: 23304651
Change-Id: I4821b4c0c7796c33ad9691b6735235a220fa635a
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a59e9ae0c..11f525802 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -996,6 +996,12 @@ public class Launcher extends Activity mPaused = false; if (mRestoring || mOnResumeNeedsLoad) { setWorkspaceLoading(true); + + // If we're starting binding all over again, clear any bind calls we'd postponed in + // the past (see waitUntilResume) -- we don't need them since we're starting binding + // from scratch again + mBindOnResumeCallbacks.clear(); + mModel.startLoader(PagedView.INVALID_RESTORE_PAGE); mRestoring = false; mOnResumeNeedsLoad = false; |