Merge changes from topics "input_events_id", "wire_input_event_id" into... (fa0e0f55) · Commits · e / os / android_frameworks_base

core/jni/android_view_InputEventSender.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -114,9 +114,9 @@ status_t NativeInputEventSender::sendKeyEvent(uint32_t seq, const KeyEvent* even

		uint32_t publishedSeq = mNextPublishedSeq++;
		status_t status =
		mInputPublisher.publishKeyEvent(publishedSeq, event->getDeviceId(), event->getSource(),
		event->getDisplayId(), event->getHmac(),
		event->getAction(), event->getFlags(),
		mInputPublisher.publishKeyEvent(publishedSeq, event->getId(), event->getDeviceId(),
		event->getSource(), event->getDisplayId(),
		event->getHmac(), event->getAction(), event->getFlags(),
		event->getKeyCode(), event->getScanCode(),
		event->getMetaState(), event->getRepeatCount(),
		event->getDownTime(), event->getEventTime());
		@@ -138,12 +138,12 @@ status_t NativeInputEventSender::sendMotionEvent(uint32_t seq, const MotionEvent
		for (size_t i = 0; i <= event->getHistorySize(); i++) {
		publishedSeq = mNextPublishedSeq++;
		status_t status =
		mInputPublisher.publishMotionEvent(publishedSeq, event->getDeviceId(),
		event->getSource(), event->getDisplayId(),
		event->getHmac(), event->getAction(),
		event->getActionButton(), event->getFlags(),
		event->getEdgeFlags(), event->getMetaState(),
		event->getButtonState(),
		mInputPublisher.publishMotionEvent(publishedSeq, event->getId(),
		event->getDeviceId(), event->getSource(),
		event->getDisplayId(), event->getHmac(),
		event->getAction(), event->getActionButton(),
		event->getFlags(), event->getEdgeFlags(),
		event->getMetaState(), event->getButtonState(),
		event->getClassification(), event->getXScale(),
		event->getYScale(), event->getXOffset(),
		event->getYOffset(), event->getXPrecision(),