commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3
author Michael Wright <michaelwr@google.com> Thu May 14 14:46:17 2015 +0100
committer Michael Wright <michaelwr@google.com> Thu May 14 14:46:17 2015 +0100
tree 0a15a5d433a0b65a5bb8946ddbccc22de4dbae3b
parent 48a8a0e4322969e1551536d6183af3a1faa2240b

Revert "Add new MotionEvent actions for button press and release."

This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.

services/inputflinger/InputDispatcher.h

diff --git a/services/inputflinger/InputDispatcher.h b/services/inputflinger/InputDispatcher.h
index 9a340c9..8c78a44 100644
--- a/services/inputflinger/InputDispatcher.h
+++ b/services/inputflinger/InputDispatcher.h
@@ -504,7 +504,6 @@
         int32_t deviceId;
         uint32_t source;
         int32_t action;
-        int32_t actionButton;
         int32_t flags;
         int32_t metaState;
         int32_t buttonState;
@@ -519,10 +518,10 @@
 
         MotionEntry(nsecs_t eventTime,
                 int32_t deviceId, uint32_t source, uint32_t policyFlags,
-                int32_t action, int32_t actionButton, int32_t flags,
+                int32_t action, int32_t flags,
                 int32_t metaState, int32_t buttonState, int32_t edgeFlags,
-                float xPrecision, float yPrecision, nsecs_t downTime,
-                int32_t displayId, uint32_t pointerCount,
+                float xPrecision, float yPrecision,
+                nsecs_t downTime, int32_t displayId, uint32_t pointerCount,
                 const PointerProperties* pointerProperties, const PointerCoords* pointerCoords,
                 float xOffset, float yOffset);
         virtual void appendDescription(String8& msg) const;