commit 17e971d53101bf5cc4223beb16c79820b3ad5200
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 10 19:17:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 19:17:35 2021 +0000
tree c6b2abd551bdc7aa5f5c553cbd91c3dcab99b19e
parent 5e6ee892024b8f50ded444ce838b55811c26bc54
parent 086fabe3bdc4b021f8506336c2148200c08b3424

Merge changes from topic "am-c13f9b3a64c14962854a8426d1938dbf" into sc-dev

* changes:
  [automerger skipped] Merge changes from topic "b/167709539" am: ad688d3e8c am: 7d360a08a0 am: df594989e6 -s ours
  [automerger skipped] Add total size of DMA-BUFs exported to 'dumpsys meminfo' am: 363d44d7a0 am: 8bff83e9ff am: 5e4dadb0a0 -s ours
  [automerger skipped] Rename getIonMappedSizeKb to getDmabufMappedSizeKb am: 6ae0be89b9 am: 8ce7111610 am: 6320b051a7 -s ours

core/jni/android_view_InputEventSender.cpp

diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp
index ac680f6..9746a07 100644
--- a/core/jni/android_view_InputEventSender.cpp
+++ b/core/jni/android_view_InputEventSender.cpp
@@ -199,7 +199,13 @@
     for (;;) {
         uint32_t publishedSeq;
         bool handled;
-        status_t status = mInputPublisher.receiveFinishedSignal(&publishedSeq, &handled);
+        std::function<void(uint32_t seq, bool handled, nsecs_t consumeTime)> callback =
+                [&publishedSeq, &handled](uint32_t inSeq, bool inHandled,
+                                          nsecs_t inConsumeTime) -> void {
+            publishedSeq = inSeq;
+            handled = inHandled;
+        };
+        status_t status = mInputPublisher.receiveFinishedSignal(callback);
         if (status) {
             if (status == WOULD_BLOCK) {
                 return OK;