| commit | 822d7851ce2d852d5b602e090beff1359ca271ab | [log] [tgz] |
|---|---|---|
| author | Vaibhav Devmurari <vdevmurari@google.com> | Thu Sep 26 19:28:51 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 26 19:28:51 2024 +0000 |
| tree | 56d1bd57c3990291e234d096e2fb1ccd0f63ab56 | |
| parent | a81376b0d20b45a220ebfca9a6995607d824be69 [diff] [blame] |
Revert "Allow metaState changes from keys not declared by the keyboard" This reverts commit a81376b0d20b45a220ebfca9a6995607d824be69. Reason for revert: Breaks Alt+Meta=CapsLock for composite keyboards with multiple KeyboardInputMappers Change-Id: Idc028734acc23c401286c45acd906bb50c11e812
diff --git a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp index 21ecbcf..38dcd65 100644 --- a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp +++ b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
@@ -391,7 +391,7 @@ } bool KeyboardInputMapper::updateMetaState(int32_t keyCode) { - if (!android::isMetaKey(keyCode)) { + if (!android::isMetaKey(keyCode) || !getDeviceContext().hasKeyCode(keyCode)) { return false; }