diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-12-02 19:40:24 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-12-02 19:40:24 -0800 |
| commit | 23bf5e530a76be87738928608b04a70017ad0c94 (patch) | |
| tree | 33da352d033ecea4a2227f670879b44853973b5a /java/src | |
| parent | 715514d7dd5716c77781b97d4f6ac8eace75e8b3 (diff) | |
| parent | 566870c0f152ef691b0e2e1f4e1cf63f28e63712 (diff) | |
| download | latinime-23bf5e530a76be87738928608b04a70017ad0c94.tar.gz latinime-23bf5e530a76be87738928608b04a70017ad0c94.tar.xz latinime-23bf5e530a76be87738928608b04a70017ad0c94.zip | |
Merge "Fix NPE at Keyboard"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Keyboard.java | 6 |
1 files 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) { |