Fix SecondFingerMultiTap

Set the baseX and baseY in SecondFingerMultiTap to be the second finger
instead of the first finger. Otherwise, the gesture is impossible to
perform because isSecondFingerInsideSlop() always returns false in
SecondFingerMultiTap.onMove().

Verified that a SecondFingerMultiTap triggers a double tap event.

Change-Id: I451c6b9982344c1d560a0643fe0dcdfcc81968ef

1 files changed, 4 insertions, 4 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/SecondFingerMultiTap.java b/services/accessibility/java/com/android/server/accessibility/gestures/SecondFingerMultiTap.java
index 954412d12b46..642533991aa5 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/SecondFingerMultiTap.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/SecondFingerMultiTap.java
@@ -72,14 +72,14 @@ class SecondFingerMultiTap extends GestureMatcher {
         mSecondFingerPointerId = event.getPointerId(index);
         cancelAfterTapTimeout(event, rawEvent, policyFlags);
         if (Float.isNaN(mBaseX) && Float.isNaN(mBaseY)) {
-            mBaseX = event.getX();
-            mBaseY = event.getY();
+            mBaseX = event.getX(index);
+            mBaseY = event.getY(index);
         }
         if (!isSecondFingerInsideSlop(rawEvent, mDoubleTapSlop)) {
             cancelGesture(event, rawEvent, policyFlags);
         }
-        mBaseX = event.getX();
-        mBaseY = event.getY();
+        mBaseX = event.getX(index);
+        mBaseY = event.getY(index);
     }
 
     @Override