commit f8a45cfd2fe3ed68d0e9ccbbed5d0beb2d1e9f06
author Tadashi G. Takaoka <takaoka@google.com> Thu Feb 27 14:14:52 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Feb 27 14:17:14 2014 +0900
tree e8d1c15af0e06c38053804f02d67cf4077f4aff9
parent 997ba1b41e73f88188662adbed5cfc3cfe31ef66

Fix NPE in KeyDetector

This is actually a follow up of I9290974821.

Bug: 13215075
Change-Id: Ib7eef55fd1cfbb05d06aeeb0726bc10c87b07d85

java/src/com/android/inputmethod/keyboard/KeyDetector.java

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);