commit de0dbd7354a6bfdc7a8f3ee7ec7f9897121f5f6d
author Chris Ye <lzye@google.com> Fri Oct 02 23:06:39 2020 -0700
committer Chris Ye <lzye@google.com> Sat Oct 03 20:10:23 2020 +0000
tree b65236c99eda10081d38aba910878a6c9438d6e7
parent 5bdb7e6e77fe15b94c39cc1000b19dc47f6dd892

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

libs/input/InputEventLabels.cpp

diff --git a/libs/input/InputEventLabels.cpp b/libs/input/InputEventLabels.cpp
index dee240c..c0aa2e2 100644
--- a/libs/input/InputEventLabels.cpp
+++ b/libs/input/InputEventLabels.cpp
@@ -348,6 +348,9 @@
     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), \