commit 13065beff77ba88c4b23d89b869336a58addd673
author Vaibhav Devmurari <vdevmurari@google.com> Wed Jul 24 17:50:27 2024 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> Wed Jul 24 18:46:20 2024 +0000
tree 8aa3807a58f9133155bbffbd491cf43ddf26c280
parent 73469a129e26c6a862064eb6975c75ca8c61f6b7

Fix key location API, when many to one key mapping with KL flags

Test: manual
Flag: EXEMPT minor bugfix
Bug: 354333072
Change-Id: Ide657343873f7342cde14fa58fce64b9bbfd6ef9

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);
         }
     }