From 46286874f30c4a6ef44646c4e4adf36fe55c74b9 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 29 Aug 2011 18:36:26 +0900
Subject: [PATCH] Add guard to prevent possible IllegalStateException

Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1
---
 .../com/android/inputmethod/keyboard/LatinKeyboardView.java    | 3 +++
 java/src/com/android/inputmethod/keyboard/PointerTracker.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index b7aa82bc9..5fa9b8fc4 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -495,6 +495,9 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
 
     @Override
     public boolean onTouchEvent(MotionEvent me) {
+        if (getKeyboard() == null) {
+            return false;
+        }
         return mTouchScreenRegulator.onTouchEvent(me);
     }
 
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 83bab67ba..b61947232 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -283,7 +283,7 @@ public class PointerTracker {
         mListener.onCancelInput();
     }
 
-    public void setKeyDetectorInner(KeyDetector keyDetector) {
+    private void setKeyDetectorInner(KeyDetector keyDetector) {
         mKeyDetector = keyDetector;
         mKeyboard = keyDetector.getKeyboard();
         mKeys = mKeyboard.mKeys;