commit f8437960340854120486a547f0687b661629c3d9
author Philip Junker <philipjunker@google.com> Tue Jan 25 21:20:19 2022 +0100
committer Philip Junker <philipjunker@google.com> Tue Jan 25 23:50:12 2022 +0100
tree 8dad75927d1e023ea807a404c910adcefb25a90b
parent 4af3b3dcdfe9e8174d766f59e20e133df89be179

Set keyboard type to maximum of all sub devices.

Bug: 216328642
Test: atest KeyboardLayoutChangeTest
Change-Id: Id01a7ea1c766dad0f5c6bb36f61d71a9eafa2d10

include/input/InputDevice.h

diff --git a/include/input/InputDevice.h b/include/input/InputDevice.h
index 22aae19..c4f03c9 100644
--- a/include/input/InputDevice.h
+++ b/include/input/InputDevice.h
@@ -235,7 +235,7 @@
     void addBatteryInfo(const InputDeviceBatteryInfo& info);
     void addLightInfo(const InputDeviceLightInfo& info);
 
-    inline void setKeyboardType(int32_t keyboardType) { mKeyboardType = keyboardType; }
+    void setKeyboardType(int32_t keyboardType);
     inline int32_t getKeyboardType() const { return mKeyboardType; }
 
     inline void setKeyCharacterMap(const std::shared_ptr<KeyCharacterMap> value) {