Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I5ed05d0f5aa4c5e98fbd9b5275f3db39ccb76fed
Change-Id: I039103d5231a77496213df3ede1fa5b1dd259a8d

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/input/InputConsumer.cpp b/libs/input/InputConsumer.cpp
index dce528f763..1eeb4e678c 100644
--- a/libs/input/InputConsumer.cpp
+++ b/libs/input/InputConsumer.cpp
@@ -135,7 +135,7 @@ void addSample(MotionEvent& event, const InputMessage& msg) {
     }
 
     event.setMetaState(event.getMetaState() | msg.body.motion.metaState);
-    event.addSample(msg.body.motion.eventTime, pointerCoords);
+    event.addSample(msg.body.motion.eventTime, pointerCoords, msg.body.motion.eventId);
 }
 
 void initializeTouchModeEvent(TouchModeEvent& event, const InputMessage& msg) {
@@ -697,7 +697,7 @@ void InputConsumer::resampleTouchState(nsecs_t sampleTime, MotionEvent* event,
                  currentCoords.getY(), otherCoords.getX(), otherCoords.getY(), alpha);
     }
 
-    event->addSample(sampleTime, touchState.lastResample.pointers);
+    event->addSample(sampleTime, touchState.lastResample.pointers, event->getId());
 }
 
 status_t InputConsumer::sendFinishedSignal(uint32_t seq, bool handled) {