commit db61fff8bdfb6cbab67f33beba44f6e0fbe5c3c1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Mar 12 00:34:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 00:34:11 2024 +0000
tree c7bdb967a62c3e2d7b280ec0734b122c65fd7733
parent d9884e39391ecb9949a09035d01c813f151a886f
parent 36daebd7c76873f9157718db658bb0d6a2bb4e48

Merge "Correctly Set Primary Pointer in TouchState" into main

services/accessibility/java/com/android/server/accessibility/gestures/TouchState.java

diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchState.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchState.java
index d9e25ef..e13994e 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchState.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchState.java
@@ -525,8 +525,9 @@
             mReceivedPointersDown |= pointerFlag;
             mReceivedPointers[pointerId].set(
                     event.getX(pointerIndex), event.getY(pointerIndex), event.getEventTime());
-
-            mPrimaryPointerId = pointerId;
+            if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+                mPrimaryPointerId = pointerId;
+            }
         }
 
         /**