Merge "Reduce indentation of a method" (01b59d86) · Commits · e / os / android_frameworks_native-old

services/inputflinger/dispatcher/InputDispatcher.cpp

+45 −45

Original line number	Diff line number	Diff line
		@@ -2699,7 +2699,9 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(
		std::vector<EventEntry*> cancelationEvents =
		connection->inputState.synthesizeCancelationEvents(currentTime, options);

		if (!cancelationEvents.empty()) {
		if (cancelationEvents.empty()) {
		return;
		}
		#if DEBUG_OUTBOUND_EVENT_DETAILS
		ALOGD("channel '%s' ~ Synthesized %zu cancelation events to bring channel back in sync "
		"with reality: %s, mode=%d.",
		@@ -2716,8 +2718,7 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(
		}
		case EventEntry::Type::MOTION: {
		logOutboundMotionDetails("cancel - ",
		static_cast<const MotionEntry&>(
		*cancelationEventEntry));
		static_cast<const MotionEntry&>(*cancelationEventEntry));
		break;
		}
		case EventEntry::Type::FOCUS: {
		@@ -2752,7 +2753,6 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(

		startDispatchCycleLocked(currentTime, connection);
		}
		}

		MotionEntry* InputDispatcher::splitMotionEvent(const MotionEntry& originalMotionEntry,
		BitSet32 pointerIds) {