commit 96f185d8af58137d55fc65110f48914221bb78f5
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:32:33 2011 +0900
tree dbd120674547090eae2af7b9b569c6e3b59bacf4
parent 0e8bbe3ab48a33b8418bec6930174c37ba561399

Fix NPE in Key.isDigitPopupCharacter

Change-Id: Ie6e8d31e41010db27e2db415b577458b73a9f1a2

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 33b55b5..4b4ffdb 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -275,7 +275,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) {