summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/android/input.h2
-rw-r--r--include/input/InputVerifier.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/include/android/input.h b/include/android/input.h
index 5f445509fa..ee98d7aee9 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -849,7 +849,6 @@ enum {
* Refer to the documentation on the MotionEvent class for descriptions of each button.
*/
enum {
- // LINT.IfChange(AMOTION_EVENT_BUTTON)
/** primary */
AMOTION_EVENT_BUTTON_PRIMARY = 1 << 0,
/** secondary */
@@ -862,7 +861,6 @@ enum {
AMOTION_EVENT_BUTTON_FORWARD = 1 << 4,
AMOTION_EVENT_BUTTON_STYLUS_PRIMARY = 1 << 5,
AMOTION_EVENT_BUTTON_STYLUS_SECONDARY = 1 << 6,
- // LINT.ThenChange(/frameworks/native/libs/input/rust/input.rs)
};
/**
diff --git a/include/input/InputVerifier.h b/include/input/InputVerifier.h
index 7d3fb469c6..14dd463425 100644
--- a/include/input/InputVerifier.h
+++ b/include/input/InputVerifier.h
@@ -47,10 +47,9 @@ public:
InputVerifier(const std::string& name);
android::base::Result<void> processMovement(int32_t deviceId, int32_t source, int32_t action,
- int32_t actionButton, uint32_t pointerCount,
+ uint32_t pointerCount,
const PointerProperties* pointerProperties,
- const PointerCoords* pointerCoords, int32_t flags,
- int32_t buttonState);
+ const PointerCoords* pointerCoords, int32_t flags);
void resetDevice(int32_t deviceId);