diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-27 05:35:37 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-27 05:35:38 +0000 |
| commit | 0d69557f140c5d86c109161308f33fa95f70e963 (patch) | |
| tree | 7588da20df335cd83aecf1225f7b203007d20abb /java/src | |
| parent | 5688bce37b0143fb136f7e235722a42b51b11c9e (diff) | |
| parent | f8a45cfd2fe3ed68d0e9ccbbed5d0beb2d1e9f06 (diff) | |
| download | latinime-0d69557f140c5d86c109161308f33fa95f70e963.tar.gz latinime-0d69557f140c5d86c109161308f33fa95f70e963.tar.xz latinime-0d69557f140c5d86c109161308f33fa95f70e963.zip | |
Merge "Fix NPE in KeyDetector"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyDetector.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/com/android/inputmethod/keyboard/KeyDetector.java index 03d9defa0..87368d4ef 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java +++ b/java/src/com/android/inputmethod/keyboard/KeyDetector.java @@ -86,6 +86,9 @@ public class KeyDetector { * @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); |