Merge "redirect to call assignPointerIds if there is id < 0 case" am: 85598ce5ac am: cad6f2e83d (63b0cd22) · Commits · e / os / android_frameworks_native

services/inputflinger/InputReader.cpp

+24 −23

Original line number	Diff line number	Diff line
		@@ -6652,6 +6652,7 @@ void MultiTouchInputMapper::syncTouch(nsecs_t when, RawState* outState) {
		size_t inCount = mMultiTouchMotionAccumulator.getSlotCount();
		size_t outCount = 0;
		BitSet32 newPointerIdBits;
		mHavePointerIds = true;

		for (size_t inIndex = 0; inIndex < inCount; inIndex++) {
		const MultiTouchMotionAccumulator::Slot* inSlot =
		@@ -6696,7 +6697,7 @@ void MultiTouchInputMapper::syncTouch(nsecs_t when, RawState* outState) {
		outPointer.isHovering = isHovering;

		// Assign pointer id using tracking id if available.
		mHavePointerIds = true;
		if (mHavePointerIds) {
		int32_t trackingId = inSlot->getTrackingId();
		int32_t id = -1;
		if (trackingId >= 0) {
		@@ -6722,7 +6723,7 @@ void MultiTouchInputMapper::syncTouch(nsecs_t when, RawState* outState) {
		outState->rawPointerData.markIdBit(id, isHovering);
		newPointerIdBits.markBit(id);
		}

		}
		outCount += 1;
		}