commit 8291ac23f86b7f9b9545308964fa8711a8fd3a0f
author Garfield Tan <xutan@google.com> Mon Feb 03 13:39:26 2020 -0800
committer Garfield Tan <xutan@google.com> Mon Feb 24 12:46:02 2020 -0800
tree 289ba5d75d5d47bf45b054f55eeb4018acace3e4
parent c8362b24f672710a96b12c004577c91da587f0f8

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

diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp
index 84acf9a..0a2b1d4 100644
--- a/core/jni/android_view_InputEventSender.cpp
+++ b/core/jni/android_view_InputEventSender.cpp
@@ -114,9 +114,9 @@
 
     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 @@
     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(),