Merge "Exit the loop after confirming the id" into main (799d4cc4) · Commits · e / devices / smdk4412 / android_frameworks_native

services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp

+2 −1

Original line number	Original line	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.		// 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;
	}		}
	}		}