Merge "Fix NPE at Keyboard"

main
Tadashi G. Takaoka 2010-12-02 19:40:24 -08:00 committed by Android (Google) Code Review
commit 23bf5e530a
1 changed files with 3 additions and 3 deletions

View File

@ -366,15 +366,15 @@ public class Keyboard {
} }
public boolean isAlphaKeyboard() { public boolean isAlphaKeyboard() {
return mId.isAlphabetKeyboard(); return mId != null && mId.isAlphabetKeyboard();
} }
public boolean isPhoneKeyboard() { public boolean isPhoneKeyboard() {
return mId.isPhoneKeyboard(); return mId != null && mId.isPhoneKeyboard();
} }
public boolean isNumberKeyboard() { public boolean isNumberKeyboard() {
return mId.isNumberKeyboard(); return mId != null && mId.isNumberKeyboard();
} }
public void setSpaceKey(Key space) { public void setSpaceKey(Key space) {