commit 77cd1bdba94bf13401c629060a056d34e3de681a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 22 19:19:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 22 19:19:01 2024 +0000
tree 1681433f71eec603f71c0a461667a16a7dee11df
parent 9349fadaa2f9e25c45a675a7d47ab34511b92ea0
parent 799d4cc47bfa3c093c79985a159503f1ad570f40

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

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

Change-Id: I1501c665e94beb1007324379511d5776af3d4816
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 5a74a42..82f9276 100644
--- a/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
@@ -140,13 +140,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;
                     }
                 }