commit be2a0989ce2dd97b6dc414d9c29456c6064c039e
author Winson Chung <winsonc@google.com> Sun Jun 13 20:49:58 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jun 13 20:49:58 2021 +0000
tree f35bbc4d85650658b8d05e3a0dc2af0b5c4b529a
parent beebc45e5df1b239aff9cc4ee095c62342b54cae
parent e46c7613a30a0e7225e5424abfe5bb215a8001dc

Merge "Ensure we pass the pointer id to the velocity tracker and not the index" into sc-dev

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());
         }