Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cd1bdb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1501c665e94beb1007324379511d5776af3d4816
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9349fada 799d4cc4

services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp

+2 −1
Original line number Diff line number Diff line
@@ -140,13 +140,14 @@ void MultiTouchInputMapper::syncTouch(nsecs_t when, RawState* outState) { 


        // 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;

                    }

                }