commit ce4b2d2daba8005c2c07a995c8a145ee812f56ff
author satok <satok@google.com> Wed Jan 19 01:02:28 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 19 01:02:28 2011 -0800
tree 77d28d5c4c37f246d329c2e2f5ca033e43cafd11
parent 86f189fd969de7259a0e0fcc1cf868ba667f3e3b
parent 82411d47ba7e8133ed2390c6920945e139a738ce

Merge "Add a safety net for auto-correction." into honeycomb

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

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index ef41cb6..e9d5580 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -205,10 +205,10 @@
     @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) {