commit | 0d69557f140c5d86c109161308f33fa95f70e963 | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Thu Feb 27 05:35:37 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 27 05:35:38 2014 +0000 |
tree | 7588da20df335cd83aecf1225f7b203007d20abb | |
parent | 5688bce37b0143fb136f7e235722a42b51b11c9e [diff] | |
parent | f8a45cfd2fe3ed68d0e9ccbbed5d0beb2d1e9f06 [diff] |
Merge "Fix NPE in KeyDetector"
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/com/android/inputmethod/keyboard/KeyDetector.java index 03d9def..87368d4 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java +++ b/java/src/com/android/inputmethod/keyboard/KeyDetector.java
@@ -86,6 +86,9 @@ * @return the key that the touch point hits. */ public Key detectHitKey(final int x, final int y) { + if (mKeyboard == null) { + return null; + } final int touchX = getTouchX(x); final int touchY = getTouchY(y);