aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-01-19 00:50:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-19 00:50:18 -0800
commit53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b (patch)
treed3972de9b5b3814045b8df73e700da48d32cfffc /java/src/com/android/inputmethod
parentd2e931f782f53d26bde25e5436030ae50e641a26 (diff)
parent86f189fd969de7259a0e0fcc1cf868ba667f3e3b (diff)
downloadlatinime-53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b.tar.gz
latinime-53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b.tar.xz
latinime-53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b.zip
am 86f189fd: Fix NPE
* commit '86f189fd969de7259a0e0fcc1cf868ba667f3e3b': Fix NPE
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index ef41cb6e4..e9d5580e8 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -205,10 +205,10 @@ public class LatinKeyboardView extends KeyboardView {
@Override
public boolean onTouchEvent(MotionEvent me) {
LatinKeyboard keyboard = getLatinKeyboard();
+ if (keyboard == null) return true;
// If there was a sudden jump, return without processing the actual motion event.
- if (handleSuddenJump(me))
- return true;
+ if (handleSuddenJump(me)) return true;
// Reset any bounding box controls in the keyboard
if (me.getAction() == MotionEvent.ACTION_DOWN) {