commit 97844b90a835ce75ce8714ac41e2c57fadd651f1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Jun 13 22:05:07 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jun 13 22:05:07 2021 +0000
tree 6f0e2d9e81bda9741857afbc8635a903e3510061
parent af8aaae1c23c052408b86f52782e7cf2b127e023
parent 3b60237e380a1ef796a4130ce88b160827af032e

Merge "Merge "Revert "Revert "Update preferences to Material Next styling""" into sc-v2-dev am: 225e6ba272 am: 650fa8139a"

quickstep/src/com/android/quickstep/util/MotionPauseDetector.java

diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index 8151d41..1ed2da3 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -121,7 +121,7 @@
         mForcePauseTimeout.setAlarm(mMakePauseHarderToTrigger
                 ? HARDER_TRIGGER_TIMEOUT
                 : FORCE_PAUSE_TIMEOUT);
-        float newVelocity = mVelocityProvider.addMotionEvent(ev, pointerIndex);
+        float newVelocity = mVelocityProvider.addMotionEvent(ev, ev.getPointerId(pointerIndex));
         if (mPreviousVelocity != null) {
             checkMotionPaused(newVelocity, mPreviousVelocity, ev.getEventTime());
         }