commit ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd
author RoboErik <epastern@google.com> Mon Dec 16 11:27:55 2013 -0800
committer RoboErik <epastern@google.com> Wed Mar 12 13:21:08 2014 -0700
tree e1d23691fc25baa5271a075350eb93e01b6f1e9c
parent c1e0015ec3dfacc137cb500066020b25f18ecbb7

b/12068020 Make kb layouts only unique to vendor/product. Do not merge

This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

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: I1f2508561992080459310d5a644dad65a9c24f1a

libs/input/InputReader.cpp

diff --git a/libs/input/InputReader.cpp b/libs/input/InputReader.cpp
index d4e1a00..3c037fb8 100644
--- a/libs/input/InputReader.cpp
+++ b/libs/input/InputReader.cpp
@@ -911,7 +911,7 @@
         if (!changes || (changes & InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS)) {
             if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) {
                 sp<KeyCharacterMap> keyboardLayout =
-                        mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor);
+                        mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier);
                 if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) {
                     bumpGeneration();
                 }