diff options
| author | 2024-01-04 19:34:16 +0000 | |
|---|---|---|
| committer | 2024-01-04 19:34:16 +0000 | |
| commit | d10b99358f167e59ccfc4a206a40b923762e3a17 (patch) | |
| tree | 6eb9a5106c3fb6fa2e72ce1e8d926a84e799d796 /libs/input/KeyLayoutMap.cpp | |
| parent | f7d2e064a3428b584836829b65a36ae470cd608e (diff) | |
| parent | 0728d6ed389a9cb5410c68ede7dafbe28b1546ed (diff) | |
Merge "Add flag to mark key usage code as a fallback mapping" into main am: 587fb0bfb5 am: 0728d6ed38
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2896061
Change-Id: Ib071d813b7e963257c9968115168eb685d7900b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/KeyLayoutMap.cpp')
| -rw-r--r-- | libs/input/KeyLayoutMap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/input/KeyLayoutMap.cpp b/libs/input/KeyLayoutMap.cpp index ddc9ea457e..3c1ae3e41b 100644 --- a/libs/input/KeyLayoutMap.cpp +++ b/libs/input/KeyLayoutMap.cpp @@ -250,7 +250,7 @@ std::vector<int32_t> KeyLayoutMap::findScanCodesForKey(int32_t keyCode) const { std::vector<int32_t> KeyLayoutMap::findUsageCodesForKey(int32_t keyCode) const { std::vector<int32_t> usageCodes; for (const auto& [usageCode, key] : mKeysByUsageCode) { - if (keyCode == key.keyCode) { + if (keyCode == key.keyCode && !(key.flags & POLICY_FLAG_FALLBACK_USAGE_MAPPING)) { usageCodes.push_back(usageCode); } } |