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

Commit e2741319 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 am: 77cd1bdb 

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



Change-Id: I58f02312b55bf453a4827d3a6997b1e3685e47a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 158510ed 77cd1bdb

services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp

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




        // Assign pointer id using tracking id if available.

        // Assign pointer id using tracking id if available.

        if (mHavePointerIds) {

        if (mHavePointerIds) {

            int32_t trackingId = inSlot.getTrackingId();

            const int32_t trackingId = inSlot.getTrackingId();

            int32_t id = -1;

            int32_t id = -1;

            if (trackingId >= 0) {

            if (trackingId >= 0) {

                for (BitSet32 idBits(mPointerIdBits); !idBits.isEmpty();) {

                for (BitSet32 idBits(mPointerIdBits); !idBits.isEmpty();) {

                    uint32_t n = idBits.clearFirstMarkedBit();

                    uint32_t n = idBits.clearFirstMarkedBit();

                    if (mPointerTrackingIdMap[n] == trackingId) {

                    if (mPointerTrackingIdMap[n] == trackingId) {

                        id = n;

                        id = n;

                        break;

                    }

                    }

                }

                }