commit 46286874f30c4a6ef44646c4e4adf36fe55c74b9
author Tadashi G. Takaoka <takaoka@google.com> Mon Aug 29 18:36:26 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Aug 29 18:38:04 2011 +0900
tree a4715f41764c4f1c0ee0b54c3b5a9835b56781b7
parent ed23cc7f0be860d8b57ab4b90fb8a8265cbe871d

Add guard to prevent possible IllegalStateException

Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1

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 b7aa82b..5fa9b8f 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -495,6 +495,9 @@
 
     @Override
     public boolean onTouchEvent(MotionEvent me) {
+        if (getKeyboard() == null) {
+            return false;
+        }
         return mTouchScreenRegulator.onTouchEvent(me);
     }
 

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

diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 83bab67..b619472 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -283,7 +283,7 @@
         mListener.onCancelInput();
     }
 
-    public void setKeyDetectorInner(KeyDetector keyDetector) {
+    private void setKeyDetectorInner(KeyDetector keyDetector) {
         mKeyDetector = keyDetector;
         mKeyboard = keyDetector.getKeyboard();
         mKeys = mKeyboard.mKeys;