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

@@ -443,12 +443,18 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
             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 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         Preconditions.assertUIThread();
         removeListener();
         mInteractionHandler = null;
+        cleanupAfterGesture();
         mOnCompleteCallback.accept(this);
     }