commit 566870c0f152ef691b0e2e1f4e1cf63f28e63712
author Tadashi G. Takaoka <takaoka@google.com> Fri Dec 03 12:36:31 2010 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Dec 03 12:36:31 2010 +0900
tree d8bbbd47c1aba9cd1cb9b2bc8ef812a1e576943a
parent a0e780fa4c591014e78193af6ec0ebefa32b89a1

Fix NPE at Keyboard

Bug: 3250672
Change-Id: Ieef7ff5e8ba77a2d43f561c2bd2a1921230bd49d

java/src/com/android/inputmethod/keyboard/Keyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index 869d130..aa48292 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -366,15 +366,15 @@
     }
 
     public boolean isAlphaKeyboard() {
-        return mId.isAlphabetKeyboard();
+        return mId != null && mId.isAlphabetKeyboard();
     }
 
     public boolean isPhoneKeyboard() {
-        return mId.isPhoneKeyboard();
+        return mId != null && mId.isPhoneKeyboard();
     }
 
     public boolean isNumberKeyboard() {
-        return mId.isNumberKeyboard();
+        return mId != null && mId.isNumberKeyboard();
     }
 
     public void setSpaceKey(Key space) {