summaryrefslogtreecommitdiff
path: root/libs/input/InputEventLabels.cpp
diff options
context:
space:
mode:
author Chris Ye <lzye@google.com> 2020-10-02 23:06:39 -0700
committer Chris Ye <lzye@google.com> 2020-10-03 20:10:23 +0000
commitde0dbd7354a6bfdc7a8f3ee7ec7f9897121f5f6d (patch)
treeb65236c99eda10081d38aba910878a6c9438d6e7 /libs/input/InputEventLabels.cpp
parent5bdb7e6e77fe15b94c39cc1000b19dc47f6dd892 (diff)
Fix MotionEvent.axisToString returns wrong axis name.
Align native axes label look up with Java and NDK axes mapping. Bug: 169986418 Test: atest MotionEventTest Change-Id: Icea91024cea67d4b93da5374e56ab0e83c6c5abe
Diffstat (limited to 'libs/input/InputEventLabels.cpp')
-rw-r--r--libs/input/InputEventLabels.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/input/InputEventLabels.cpp b/libs/input/InputEventLabels.cpp
index dee240c0bf..c0aa2e26a2 100644
--- a/libs/input/InputEventLabels.cpp
+++ b/libs/input/InputEventLabels.cpp
@@ -348,6 +348,9 @@ namespace android {
DEFINE_AXIS(SCROLL), \
DEFINE_AXIS(RELATIVE_X), \
DEFINE_AXIS(RELATIVE_Y), \
+ {"RESERVED_29", 29}, \
+ {"RESERVED_30", 30}, \
+ {"RESERVED_31", 31}, \
DEFINE_AXIS(GENERIC_1), \
DEFINE_AXIS(GENERIC_2), \
DEFINE_AXIS(GENERIC_3), \