commit f0bf07f91b2d3f16d810fde9d5c178d9b7e4a48a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 31 12:03:32 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 31 12:03:32 2024 +0000
tree 169c0e5009738ed1f489ecc0412c2b1f16ff0364
parent d08dc25a249bc6d12eb6f862462586c7a5ba4e84
parent 13065beff77ba88c4b23d89b869336a58addd673

Merge "Fix key location API, when many to one key mapping with KL flags" into main

libs/input/KeyLayoutMap.cpp

diff --git a/libs/input/KeyLayoutMap.cpp b/libs/input/KeyLayoutMap.cpp
index 5088188..f3241c9 100644
--- a/libs/input/KeyLayoutMap.cpp
+++ b/libs/input/KeyLayoutMap.cpp
@@ -240,8 +240,9 @@
 
 std::vector<int32_t> KeyLayoutMap::findScanCodesForKey(int32_t keyCode) const {
     std::vector<int32_t> scanCodes;
+    // b/354333072: Only consider keys without FUNCTION flag
     for (const auto& [scanCode, key] : mKeysByScanCode) {
-        if (keyCode == key.keyCode) {
+        if (keyCode == key.keyCode && !(key.flags & POLICY_FLAG_FUNCTION)) {
             scanCodes.push_back(scanCode);
         }
     }