commit 468de9c87a2749d8db900ff483eac79b9a13cef8
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 03 17:57:11 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 03 17:57:11 2022 +0000
tree c7b5d36008265065669f1ef6f47f34c3b049c2f4
parent 25d613aaa5e35abd45523ea75f5971770efe4e9c
parent 98f204da7bbfe41a95dd2195810783fd92f25c96

Merge "Remove unused function from TouchState"

services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp

diff --git a/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
index 5d5bee7..1891205 100644
--- a/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
+++ b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
@@ -108,13 +108,13 @@
 }
 
 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;