aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-05-17 20:01:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-17 20:01:47 -0700
commit29948e7a194f7aff786120542d2da7f042c86ea5 (patch)
tree1ddf6b9b037320f322a382a5573c8917260f2fcc /java/src
parent0c661dae4b8516623229cff0dd18663bfe18ab9a (diff)
parenta9d28030964c4c99e7292d7dcfc73e1453750bf9 (diff)
downloadlatinime-29948e7a194f7aff786120542d2da7f042c86ea5.tar.gz
latinime-29948e7a194f7aff786120542d2da7f042c86ea5.tar.xz
latinime-29948e7a194f7aff786120542d2da7f042c86ea5.zip
am a9d28030: Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-dev
* commit 'a9d28030964c4c99e7292d7dcfc73e1453750bf9': Fix NPE on HOVER_EXIT event when not touching a key.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
index 1b0e488bc..2623dcc03 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
@@ -113,7 +113,7 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
case MotionEvent.ACTION_HOVER_EXIT:
// Make sure we're not getting an EXIT event because the user slid
// off the keyboard area, then force a key press.
- if (pointInView(x, y)) {
+ if (pointInView(x, y) && (key != null)) {
getAccessibilityNodeProvider().simulateKeyPress(key);
}
//$FALL-THROUGH$