diff options
| author | 2024-11-12 22:22:43 -0800 | |
|---|---|---|
| committer | 2024-11-12 22:22:43 -0800 | |
| commit | 6dc15689f6bb4b04c102ac3107f31377ee91f05e (patch) | |
| tree | 3ca9d372bc99ac1182fdb4bc895c556d0f108bd3 /libs/input/KeyLayoutMap.cpp | |
| parent | d4d02798539f29d00059d458fd01e5b2869acbb6 (diff) | |
| parent | f151262626f1c08a104cc35d9864493ea8a72dec (diff) | |
Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306
Merged-In: I9be1254c3e2685b0aa950b314c581824f40ce26c
Change-Id: I35bc501a2b1d9eb100aaab25cd660cf2e0542f99
Diffstat (limited to 'libs/input/KeyLayoutMap.cpp')
| -rw-r--r-- | libs/input/KeyLayoutMap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/input/KeyLayoutMap.cpp b/libs/input/KeyLayoutMap.cpp index 508818852e..f3241c9c32 100644 --- a/libs/input/KeyLayoutMap.cpp +++ b/libs/input/KeyLayoutMap.cpp @@ -240,8 +240,9 @@ const KeyLayoutMap::Key* KeyLayoutMap::getKey(int32_t scanCode, int32_t usageCod 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); } } |