aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-28 02:26:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 02:26:34 -0700
commit7580e9945ba096a2a084a6f571c2bd1a945dec8c (patch)
tree7d0608b48c09b775629410a4be62a888d4f05720 /java/src/com/android/inputmethod
parent9bf1dfebd8e51fb16ac26c59de9aa646b4499765 (diff)
parent48d8d8d0ae573605f938b3859bf58e1972f0d737 (diff)
downloadlatinime-7580e9945ba096a2a084a6f571c2bd1a945dec8c.tar.gz
latinime-7580e9945ba096a2a084a6f571c2bd1a945dec8c.tar.xz
latinime-7580e9945ba096a2a084a6f571c2bd1a945dec8c.zip
am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '48d8d8d0ae573605f938b3859bf58e1972f0d737': Fix potential NPE in MainKeyboardView.KeyTimerHandler
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index f0ca9c1ec..745e7dfed 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -229,6 +229,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override
public void handleMessage(final Message msg) {
final MainKeyboardView keyboardView = getOuterInstance();
+ if (keyboardView == null) {
+ return;
+ }
final PointerTracker tracker = (PointerTracker) msg.obj;
switch (msg.what) {
case MSG_TYPING_STATE_EXPIRED: