commit a4944dffa9a0476c61f6a1f194e2bf025071e6a6
author Tadashi G. Takaoka <takaoka@google.com> Thu May 19 14:32:33 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu May 19 14:36:47 2011 +0900
tree 151e625428185521d0ce2e00242e0c62e7b30769
parent 3f72d813882fd596be6288980895fd81ced9124c

Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)

This is the cherry-pick Ie6e8d31e41010db27e2db415b577458b73a9f1a2

Bug: 4442045
Change-Id: I004b15858d3d69b336c66accd0e078f0eaec0a9a

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