From 566870c0f152ef691b0e2e1f4e1cf63f28e63712 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 3 Dec 2010 12:36:31 +0900
Subject: [PATCH] Fix NPE at Keyboard

Bug: 3250672
Change-Id: Ieef7ff5e8ba77a2d43f561c2bd2a1921230bd49d
---
 java/src/com/android/inputmethod/keyboard/Keyboard.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index 869d13067..aa48292c7 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -366,15 +366,15 @@ public class Keyboard {
     }
 
     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) {