commit 470a1e57bafe1ca9f9dc9845c718bb58e4d35a22
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 08 14:18:21 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 08 14:18:21 2022 +0000
tree bf421b55ca1eaf809758ba87251cf512262b5749
parent 7df48ba2c0f707f0f19e84438ea574d2db6dac86
parent cef0eb8ea5bbbd18af936c04803408c0a2e0a28f

Merge "Remove unused variable outKey"

include/input/KeyCharacterMap.h

diff --git a/include/input/KeyCharacterMap.h b/include/input/KeyCharacterMap.h
index f6f8939..c2afb01 100644
--- a/include/input/KeyCharacterMap.h
+++ b/include/input/KeyCharacterMap.h
@@ -240,8 +240,7 @@
     KeyCharacterMap(const std::string& filename);
 
     bool getKey(int32_t keyCode, const Key** outKey) const;
-    bool getKeyBehavior(int32_t keyCode, int32_t metaState,
-            const Key** outKey, const Behavior** outBehavior) const;
+    bool getKeyBehavior(int32_t keyCode, int32_t metaState, const Behavior** outBehavior) const;
     static bool matchesMetaState(int32_t eventMetaState, int32_t behaviorMetaState);
 
     bool findKey(char16_t ch, int32_t* outKeyCode, int32_t* outMetaState) const;

libs/input/KeyCharacterMap.cpp

diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 2039fa6..a5e6512 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -304,9 +304,8 @@
 
 char16_t KeyCharacterMap::getCharacter(int32_t keyCode, int32_t metaState) const {
     char16_t result = 0;
-    const Key* key;
     const Behavior* behavior;
-    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {
+    if (getKeyBehavior(keyCode, metaState, &behavior)) {
         result = behavior->character;
     }
 #if DEBUG_MAPPING
@@ -321,9 +320,8 @@
     outFallbackAction->metaState = 0;
 
     bool result = false;
-    const Key* key;
     const Behavior* behavior;
-    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {
+    if (getKeyBehavior(keyCode, metaState, &behavior)) {
         if (behavior->fallbackKeyCode) {
             outFallbackAction->keyCode = behavior->fallbackKeyCode;
             outFallbackAction->metaState = metaState & ~behavior->metaState;
@@ -438,9 +436,8 @@
     *outKeyCode = keyCode;
     *outMetaState = metaState;
 
-    const Key* key;
     const Behavior* behavior;
-    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {
+    if (getKeyBehavior(keyCode, metaState, &behavior)) {
         if (behavior->replacementKeyCode) {
             *outKeyCode = behavior->replacementKeyCode;
             int32_t newMetaState = metaState & ~behavior->metaState;
@@ -485,13 +482,12 @@
 }
 
 bool KeyCharacterMap::getKeyBehavior(int32_t keyCode, int32_t metaState,
-        const Key** outKey, const Behavior** outBehavior) const {
+                                     const Behavior** outBehavior) const {
     const Key* key;
     if (getKey(keyCode, &key)) {
         const Behavior* behavior = key->firstBehavior;
         while (behavior) {
             if (matchesMetaState(metaState, behavior->metaState)) {
-                *outKey = key;
                 *outBehavior = behavior;
                 return true;
             }