Enable deferred input messages to be batched.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420
Change-Id: I6874d2128e880a35c6c33890c858cc6ee22af0fd

1 files changed, 6 insertions, 4 deletions

diff --git a/include/ui/InputTransport.h b/include/ui/InputTransport.h
index bdd2fb9..46b56ff 100644
--- a/include/ui/InputTransport.h
+++ b/include/ui/InputTransport.h
@@ -297,10 +297,12 @@ public:
 private:
     sp<InputChannel> mChannel;
 
-    // State about an event that consume would have returned except that it had to
-    // return a completed batch first.  Sequence number is non-zero if an event was deferred.
-    uint32_t mDeferredEventSeq;
-    MotionEvent mDeferredEvent;
+    // The current input message.
+    InputMessage mMsg;
+
+    // True if mMsg contains a valid input message that was deferred from the previous
+    // call to consume and that still needs to be handled.
+    bool mMsgDeferred;
 
     // Batched motion events per device and source.
     struct Batch {