commit e274131941190091df17d19355999752662c32e6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 22 19:32:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 22 19:32:47 2024 +0000
tree e4d75eb67cca3448c27b0814c0c886865a92a58a
parent 158510edc2fd5880c01cb8dc0f01df250e2b92e0
parent 77cd1bdba94bf13401c629060a056d34e3de681a

Merge "Exit the loop after confirming the id" into main am: 799d4cc47b am: 77cd1bdba9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3064222

Change-Id: I58f02312b55bf453a4827d3a6997b1e3685e47a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp b/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
index 0c58dab..bca9d91 100644
--- a/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
@@ -138,13 +138,14 @@
 
         // Assign pointer id using tracking id if available.
         if (mHavePointerIds) {
-            int32_t trackingId = inSlot.getTrackingId();
+            const int32_t trackingId = inSlot.getTrackingId();
             int32_t id = -1;
             if (trackingId >= 0) {
                 for (BitSet32 idBits(mPointerIdBits); !idBits.isEmpty();) {
                     uint32_t n = idBits.clearFirstMarkedBit();
                     if (mPointerTrackingIdMap[n] == trackingId) {
                         id = n;
+                        break;
                     }
                 }