From 8291ac23f86b7f9b9545308964fa8711a8fd3a0f Mon Sep 17 00:00:00 2001 From: Garfield Tan Date: Mon, 3 Feb 2020 13:39:26 -0800 Subject: [PATCH] Send input event ID in InputEventSender. Bug: 144889238 Test: Builds. Change-Id: I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 Merged-In: I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 (cherry picked from commit 4e67f841a7cbdd7113510cfc6c0e859cb0d8c6c4) --- core/jni/android_view_InputEventSender.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp index 84acf9ac6989d..0a2b1d4a661f7 100644 --- a/core/jni/android_view_InputEventSender.cpp +++ b/core/jni/android_view_InputEventSender.cpp @@ -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(),