From 3d051487502235fed463cbdae0de3a6f454ce184 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 21 Apr 2020 16:24:47 -0500
Subject: [PATCH] Stop computing scroll if handler is invalidated

Bug: 153589287
Change-Id: I0282ec82fe4ae1f74a0f4342471ffd53f43095d7
(cherry picked from commit 9df3f0cebf40c2dfc8102de303364657ec3f68d1)
---
 .../src/com/android/quickstep/LauncherSwipeHandler.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
index 5a64382478..6598971c4d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -1076,7 +1076,8 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
     }
 
     private void continueComputingRecentsScrollIfNecessary() {
-        if (!mGestureState.hasState(STATE_RECENTS_SCROLLING_FINISHED)) {
+        if (!mGestureState.hasState(STATE_RECENTS_SCROLLING_FINISHED)
+                && !mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
             computeRecentsScrollIfInvisible();
             mRecentsView.post(this::continueComputingRecentsScrollIfNecessary);
         }