From a4944dffa9a0476c61f6a1f194e2bf025071e6a6 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 19 May 2011 14:32:33 +0900
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 24e8926c5..15259a289 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -267,7 +267,7 @@ public class Key {
     }
 
     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) {