From 22aa3813f818e46a096fef6490db2a60f2617eb7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 19 Aug 2015 16:24:27 -0700
Subject: Pending bind callbacks should be cleared before starting the loader,
 similar to startBinding

Bug: 23310446
Bug: 19422965
Bug: 23304651
Change-Id: I4821b4c0c7796c33ad9691b6735235a220fa635a
---
 src/com/android/launcher3/Launcher.java | 6 ++++++
 1 file changed, 6 insertions(+)

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;
-- 
cgit v1.2.3