commit bcdc73f5a7890cf673479b79488664faa3688892
author Romain Guy <romainguy@google.com> Fri Jan 14 18:49:55 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 14 18:49:55 2011 -0800
tree 1dbf7325b6c8d7a89805630e320c42271cf7a795
parent f4f4f369690c65b893db257c7c921a425c0976e7
parent 6e3544e6764725a0653495348ff658129f4e79c0

Merge "Don't crash Launcher on config change." into honeycomb

libs/ui/KeyCharacterMap.cpp

diff --git a/libs/ui/KeyCharacterMap.cpp b/libs/ui/KeyCharacterMap.cpp
index 9bfa8f6..2decfe9 100644
--- a/libs/ui/KeyCharacterMap.cpp
+++ b/libs/ui/KeyCharacterMap.cpp
@@ -185,9 +185,11 @@
     const Key* key;
     const Behavior* behavior;
     if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {
-        outFallbackAction->keyCode = behavior->fallbackKeyCode;
-        outFallbackAction->metaState = metaState & ~behavior->metaState;
-        result = true;
+        if (behavior->fallbackKeyCode) {
+            outFallbackAction->keyCode = behavior->fallbackKeyCode;
+            outFallbackAction->metaState = metaState & ~behavior->metaState;
+            result = true;
+        }
     }
 #if DEBUG_MAPPING
     LOGD("getFallbackKeyCode: keyCode=%d, metaState=0x%08x ~ Result %s, "