commit 9d98a7ed188965dbc86754d295007e215890d956
author Tadashi G. Takaoka <takaoka@google.com> Thu May 19 20:38:12 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 19 20:38:12 2011 -0700
tree e0b2f0dd785780914128e4a175f32f48a1899bc6
parent 13dc12cca026a99bf01693ff2e25ca95c5b28da5
parent 8632bff2d5a8e1160989008dea6eff4b94b065dd

Merge "Fix copyright author from Google to AOSP"

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 b365be8..ef86d66 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) {