From fb290df3c9a6f37ec050163029e25844de2f8590 Mon Sep 17 00:00:00 2001 From: RoboErik Date: Mon, 16 Dec 2013 11:27:55 -0800 Subject: b/12068020 Make kb layouts only unique to vendor/product Instead of storing a kb layout per device descriptor (which is expected to be unique), store it for each vendor/product. This way we can keep a consistent layout between identical but physically different keyboards. There are some corner cases this is expected to fail on, namely devices that incorrectly have the same vendor/product id. Devices that don't define a vendor/product id will continue to use the descriptor to store layout files. Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f --- libs/input/InputReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/input/InputReader.cpp') diff --git a/libs/input/InputReader.cpp b/libs/input/InputReader.cpp index a683c4b..94e2a80 100644 --- a/libs/input/InputReader.cpp +++ b/libs/input/InputReader.cpp @@ -911,7 +911,7 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config if (!changes || (changes & InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS)) { if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) { sp keyboardLayout = - mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor); + mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier); if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) { bumpGeneration(); } -- cgit v1.1