commit 4f05b5fb0dd425ee4dc432f08e625b65d78030c6
author Prabir Pradhan <prabirmsp@google.com> Tue Oct 11 21:24:07 2022 +0000
committer Prabir Pradhan <prabirmsp@google.com> Thu Oct 27 20:56:59 2022 +0000
tree 69425d6ad003c0216bc137a839fba0acdab8d156
parent 84395e6eb555b2e148e62fe85b222fd9135c1450

TouchButtonAccumulator: Recognize mapped stylus buttons

Input devices can be configured to remap some keys using kl files.
Ensure that we use mapped key codes to determine the state of stylus
buttons.

Bug: 246394583
Test: atest inputflinger_tests

Change-Id: Iedf67063f3bf34eefe922342456f500d88580ed9

services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp
index 0404c9a..56fc5fa 100644
--- a/services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp
@@ -24,7 +24,7 @@
 namespace android {
 
 ExternalStylusInputMapper::ExternalStylusInputMapper(InputDeviceContext& deviceContext)
-      : InputMapper(deviceContext) {}
+      : InputMapper(deviceContext), mTouchButtonAccumulator(deviceContext) {}
 
 uint32_t ExternalStylusInputMapper::getSources() const {
     return AINPUT_SOURCE_STYLUS;
@@ -48,13 +48,13 @@
                                                            const InputReaderConfiguration* config,
                                                            uint32_t changes) {
     getAbsoluteAxisInfo(ABS_PRESSURE, &mRawPressureAxis);
-    mTouchButtonAccumulator.configure(getDeviceContext());
+    mTouchButtonAccumulator.configure();
     return {};
 }
 
 std::list<NotifyArgs> ExternalStylusInputMapper::reset(nsecs_t when) {
     mSingleTouchMotionAccumulator.reset(getDeviceContext());
-    mTouchButtonAccumulator.reset(getDeviceContext());
+    mTouchButtonAccumulator.reset();
     return InputMapper::reset(when);
 }