commit 61c08240585a6186b4bd879d87f238b3efc368f8
author Jeff Brown <jeffbrown@google.com> Thu Apr 19 11:14:33 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Thu Apr 19 11:25:09 2012 -0700
tree eea1c0be7804cc8e672f9db04a0887be9eb3c54f
parent c3643b901308289132269aa3af9a738cd2b60f08

Don't load keyboard layout overlay for virtual keyboard.

Bug: 6110399
Change-Id: I07c85cf991790ed8766b097acc39295a8065a5ea

services/input/EventHub.cpp

diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index 326dc32..6ec020c 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -1465,6 +1465,8 @@
                     device->keyMap.keyCharacterMapFile.string());
             dump.appendFormat(INDENT3 "ConfigurationFile: %s\n",
                     device->configurationFile.string());
+            dump.appendFormat(INDENT3 "HaveKeyboardLayoutOverlay: %s\n",
+                    toString(device->overlayKeyMap != NULL));
         }
     } // release lock
 }

services/input/InputReader.cpp

diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp
index 95e56bf..4cc3d44 100644
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -963,10 +963,12 @@
         }
 
         if (!changes || (changes & InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS)) {
-            sp<KeyCharacterMap> keyboardLayout =
-                    mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor);
-            if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) {
-                bumpGeneration();
+            if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) {
+                sp<KeyCharacterMap> keyboardLayout =
+                        mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor);
+                if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) {
+                    bumpGeneration();
+                }
             }
         }