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

This reverts commit ec0ce51b733f10c620cb9447b074f022d042e31d.

1 files changed, 0 insertions, 71 deletions

diff --git a/core/java/android/view/InputEventConsistencyVerifier.java b/core/java/android/view/InputEventConsistencyVerifier.java
index 46ef379d5c9c..c5e4c21061a4 100644
--- a/core/java/android/view/InputEventConsistencyVerifier.java
+++ b/core/java/android/view/InputEventConsistencyVerifier.java
@@ -97,9 +97,6 @@ public final class InputEventConsistencyVerifier {
     // Set to true if we received hover enter.
     private boolean mHoverEntered;
 
-    // The bitset of buttons which we've received ACTION_BUTTON_PRESS for.
-    private int mButtonsPressed;
-
     // The current violation message.
     private StringBuilder mViolationMessage;
 
@@ -151,7 +148,6 @@ public final class InputEventConsistencyVerifier {
         mTouchEventStreamIsTainted = false;
         mTouchEventStreamUnhandled = false;
         mHoverEntered = false;
-        mButtonsPressed = 0;
 
         while (mKeyStateList != null) {
             final KeyState state = mKeyStateList;
@@ -470,8 +466,6 @@ public final class InputEventConsistencyVerifier {
 
             final int action = event.getAction();
             final int source = event.getSource();
-            final int buttonState = event.getButtonState();
-            final int actionButton = event.getActionButton();
             if ((source & InputDevice.SOURCE_CLASS_POINTER) != 0) {
                 switch (action) {
                     case MotionEvent.ACTION_HOVER_ENTER:
@@ -492,62 +486,6 @@ public final class InputEventConsistencyVerifier {
                         ensureHistorySizeIsZeroForThisAction(event);
                         ensurePointerCountIsOneForThisAction(event);
                         break;
-                    case MotionEvent.ACTION_BUTTON_PRESS:
-                        ensureActionButtonIsNonZeroForThisAction(event);
-                        if ((mButtonsPressed & actionButton) != 0) {
-                            problem("Action button for ACTION_BUTTON_PRESS event is " +
-                                    actionButton + ", but it has already been pressed and " +
-                                    "has yet to be released.");
-                        }
-
-                        mButtonsPressed |= actionButton;
-                        // The system will automatically mirror the stylus buttons onto the button
-                        // state as the old set of generic buttons for apps targeting pre-M. If
-                        // it looks this has happened, go ahead and set the generic buttons as
-                        // pressed to prevent spurious errors.
-                        if (actionButton == MotionEvent.BUTTON_STYLUS_PRIMARY &&
-                                (buttonState & MotionEvent.BUTTON_SECONDARY) != 0) {
-                            mButtonsPressed |= MotionEvent.BUTTON_SECONDARY;
-                        } else if (actionButton == MotionEvent.BUTTON_STYLUS_SECONDARY &&
-                                (buttonState & MotionEvent.BUTTON_TERTIARY) != 0) {
-                            mButtonsPressed |= MotionEvent.BUTTON_TERTIARY;
-                        }
-
-                        if (mButtonsPressed != buttonState) {
-                            problem(String.format("Reported button state differs from " +
-                                    "expected button state based on press and release events. " +
-                                    "Is 0x%08x but expected 0x%08x.",
-                                    buttonState, mButtonsPressed));
-                        }
-                        break;
-                    case MotionEvent.ACTION_BUTTON_RELEASE:
-                        ensureActionButtonIsNonZeroForThisAction(event);
-                        if ((mButtonsPressed & actionButton) != actionButton) {
-                            problem("Action button for ACTION_BUTTON_RELEASE event is " +
-                                    actionButton + ", but it was either never pressed or has " +
-                                    "already been released.");
-                        }
-
-                        mButtonsPressed &= ~actionButton;
-                        // The system will automatically mirror the stylus buttons onto the button
-                        // state as the old set of generic buttons for apps targeting pre-M. If
-                        // it looks this has happened, go ahead and set the generic buttons as
-                        // released to prevent spurious errors.
-                        if (actionButton == MotionEvent.BUTTON_STYLUS_PRIMARY &&
-                                (buttonState & MotionEvent.BUTTON_SECONDARY) == 0) {
-                            mButtonsPressed &= ~MotionEvent.BUTTON_SECONDARY;
-                        } else if (actionButton == MotionEvent.BUTTON_STYLUS_SECONDARY &&
-                                (buttonState & MotionEvent.BUTTON_TERTIARY) == 0) {
-                            mButtonsPressed &= ~MotionEvent.BUTTON_TERTIARY;
-                        }
-
-                        if (mButtonsPressed != buttonState) {
-                            problem(String.format("Reported button state differs from " +
-                                    "expected button state based on press and release events. " +
-                                    "Is 0x%08x but expected 0x%08x.",
-                                    buttonState, mButtonsPressed));
-                        }
-                        break;
                     default:
                         problem("Invalid action for generic pointer event.");
                         break;
@@ -625,15 +563,6 @@ public final class InputEventConsistencyVerifier {
         }
     }
 
-    private void ensureActionButtonIsNonZeroForThisAction(MotionEvent event) {
-        final int actionButton = event.getActionButton();
-        if (actionButton == 0) {
-            problem("No action button set. Action button should always be non-zero for " +
-                    MotionEvent.actionToString(event.getAction()));
-
-        }
-    }
-
     private void ensureHistorySizeIsZeroForThisAction(MotionEvent event) {
         final int historySize = event.getHistorySize();
         if (historySize != 0) {