commit 6b6d0a397276f581569b1968656af76c4ee47109
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 05 17:19:32 2019 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Aug 05 17:20:10 2019 -0700
tree d47cf59d3a46b8f1a7713028a1c55d159ef5a00d
parent cf92f3edb05cfb3c2783f8b5e7c668dec84f8b15

Fix DEFER_UPDATES_NEXT_DRAW flag is not unset when binging happens twice

Bug: 138646754
Change-Id: I76eccdb812013299e18f197ba17ff858a01a6338

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 03fdc97..5b38261 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1896,6 +1896,10 @@
         if (mPendingExecutor != null) {
             mPendingExecutor.markCompleted();
             mPendingExecutor = null;
+
+            // We might have set this flag previously and forgot to clear it.
+            mAppsView.getAppsStore()
+                    .disableDeferUpdatesSilently(AllAppsStore.DEFER_UPDATES_NEXT_DRAW);
         }
     }
 
@@ -2249,9 +2253,7 @@
 
     @Override
     public void executeOnNextDraw(ViewOnDrawExecutor executor) {
-        if (mPendingExecutor != null) {
-            mPendingExecutor.markCompleted();
-        }
+        clearPendingBinds();
         mPendingExecutor = executor;
         if (!isInState(ALL_APPS)) {
             mAppsView.getAppsStore().enableDeferUpdates(AllAppsStore.DEFER_UPDATES_NEXT_DRAW);