summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prabir Pradhan <prabirmsp@google.com> 2022-11-03 15:42:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-11-03 15:42:35 +0000
commit25d613aaa5e35abd45523ea75f5971770efe4e9c (patch)
tree082bbd07894ab01719a3ddea481a1f2d6f86e8ce
parent4da2bc583f0c465077b2da8dd503f91a6e1a69a5 (diff)
parent09e40f6444f1b7b14612ec6345271b4396af8ebb (diff)
Merge "Address missed comments from ag/20198235"
-rw-r--r--services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
index 5d5bee7feb..1891205ed6 100644
--- a/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
+++ b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
@@ -108,13 +108,13 @@ void TouchButtonAccumulator::process(const RawEvent* rawEvent) {
}
void TouchButtonAccumulator::processMappedKey(int32_t scanCode, bool down) {
- int32_t outKeyCode, outMetaState;
- uint32_t outFlags;
+ int32_t keyCode, metaState;
+ uint32_t flags;
if (mDeviceContext.mapKey(scanCode, mHidUsageAccumulator.consumeCurrentHidUsage(),
- 0 /*metaState*/, &outKeyCode, &outMetaState, &outFlags) != OK) {
+ 0 /*metaState*/, &keyCode, &metaState, &flags) != OK) {
return;
}
- switch (outKeyCode) {
+ switch (keyCode) {
case AKEYCODE_STYLUS_BUTTON_PRIMARY:
mBtnStylus = down;
break;