commit 24e6643fbccd2f463ad9e20d5e48cb04c15c4d39
author Tadashi G. Takaoka <takaoka@google.com> Wed May 18 23:40:42 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 23:40:42 2011 -0700
tree cc46fb885e56a528be2c5e31946ab8a670a40b66
parent a4944dffa9a0476c61f6a1f194e2bf025071e6a6
parent d73bdfeb18eb77bcc96d4c9a7cc07693d12b943d

Merge "Fix Serbian (Cyrillic) keyboard layout (DO NOT MERGE)" into honeycomb-mr2

java/src/com/android/inputmethod/keyboard/Key.java

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 24e8926..15259a2 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -267,7 +267,7 @@
     }
 
     private static boolean isDigitPopupCharacter(CharSequence label) {
-        return label.length() == 1 && Character.isDigit(label.charAt(0));
+        return label != null && label.length() == 1 && Character.isDigit(label.charAt(0));
     }
 
     private static CharSequence[] filterOutDigitPopupCharacters(CharSequence[] popupCharacters) {