Force input device changed callback when Keyboard layout info is updated
Virtual keyboard creation uses KEYBOARD_LAYOUT_ASSOCIATION reconfig to
associated input device with keyboard layout info. But this can
happen after input device added (Race condition between device creation
and input device added callback.)
If input device already added then we sometimes don't get input device
changed callback since the generation is same.
Test: atest VirtualKeyboardLayoutTest
Bug: 277778640
Change-Id: I218b6d797da27ec3a383fbcd2ebeacb0afbf5fab
diff --git a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
index 582fb46..7388752 100644
--- a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
@@ -148,8 +148,12 @@
if (!changes.any() ||
changes.test(InputReaderConfiguration::Change::KEYBOARD_LAYOUT_ASSOCIATION)) {
- mKeyboardLayoutInfo =
+ std::optional<KeyboardLayoutInfo> newKeyboardLayoutInfo =
getValueByKey(config.keyboardLayoutAssociations, getDeviceContext().getLocation());
+ if (mKeyboardLayoutInfo != newKeyboardLayoutInfo) {
+ mKeyboardLayoutInfo = newKeyboardLayoutInfo;
+ bumpGeneration();
+ }
}
return out;