commit d100f6825f4514e64a6d8435b6209ca57c5d5e7e
author Tony Wickham <twickham@google.com> Thu Jun 16 15:28:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 16 15:28:03 2022 +0000
tree b7b6e3f7ee2e730a5a9dc5d778eb450192d19cfb
parent ccc55f166847ecb663c9ea730b822c85e66343fd
parent 1cba5f9d47e4392f1e99d40a6a7fdaf9742caedb

Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942

Change-Id: Ib76e6458f71282ebb7753db8c4ea9b671fb0fa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 10b4ff9..641385d 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -443,12 +443,18 @@
             mMainThreadHandler.removeCallbacks(mCancelRecentsAnimationRunnable);
             mMainThreadHandler.postDelayed(mCancelRecentsAnimationRunnable, 100);
         }
-        mVelocityTracker.recycle();
-        mVelocityTracker = null;
-        mMotionPauseDetector.clear();
+        cleanupAfterGesture();
         TraceHelper.INSTANCE.endSection(traceToken);
     }
 
+    private void cleanupAfterGesture() {
+        if (mVelocityTracker != null) {
+            mVelocityTracker.recycle();
+            mVelocityTracker = null;
+        }
+        mMotionPauseDetector.clear();
+    }
+
     @Override
     public void notifyOrientationSetup() {
         mRotationTouchHelper.onStartGesture();
@@ -471,6 +477,7 @@
         Preconditions.assertUIThread();
         removeListener();
         mInteractionHandler = null;
+        cleanupAfterGesture();
         mOnCompleteCallback.accept(this);
     }