commit 1f1638d62b0058237dffd4524471528ed8c0efe6
author Tadashi G. Takaoka <takaoka@google.com> Wed May 18 23:46:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 18 23:46:23 2011 -0700
tree 151e625428185521d0ce2e00242e0c62e7b30769
parent 31f256290b2419c5753466c41c5315e3d2faf679
parent a4944dffa9a0476c61f6a1f194e2bf025071e6a6

am a4944dff: Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)

* commit 'a4944dffa9a0476c61f6a1f194e2bf025071e6a6':
  Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)

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) {