commit 091ee76285593d4c2a638d1927016e5bdfceccfd
author Jean Chalard <jchalard@google.com> Tue Sep 27 02:31:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 02:31:29 2011 -0700
tree 0516878e229c29b058ace1e666d46bbdc2ff9c90
parent e4ff4d6b1c14bb7ce20f8b93a90f9f80a3ea5fc3
parent cad25fc8a754d6f145bc846f17f270220b15c055

Merge "Fix a bug ending in a NPE in some rare cases."

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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index c94ffd9..6af4123 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -968,7 +968,7 @@
     }
 
     @Override
-    public void onDetachedFromWindow() {
+    protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         closing();
         if (mPreviewPlacer != null) {

java/src/com/android/inputmethod/latin/SuggestionsView.java

diff --git a/java/src/com/android/inputmethod/latin/SuggestionsView.java b/java/src/com/android/inputmethod/latin/SuggestionsView.java
index 1961487..9d0e42a 100644
--- a/java/src/com/android/inputmethod/latin/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/SuggestionsView.java
@@ -862,7 +862,7 @@
     }
 
     @Override
-    public void onDetachedFromWindow() {
+    protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mHandler.cancelAllMessages();
         hidePreview();