summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-10-03 21:02:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-03 21:02:20 -0700
commitebf7e2851cab55348153fca299c52042b125924d (patch)
tree606efaa5e836ac0d12510f074f31a65d7cc47276 /core
parent5b14b9698c288031fea6b40f0e1240c32ac83725 (diff)
parent3573950e0b30178dc963de3fa00aba2ebcfd552d (diff)
downloadframeworks_base-ebf7e2851cab55348153fca299c52042b125924d.zip
frameworks_base-ebf7e2851cab55348153fca299c52042b125924d.tar.gz
frameworks_base-ebf7e2851cab55348153fca299c52042b125924d.tar.bz2
Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 3ea6df3..4a3f846 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1078,8 +1078,11 @@ public final class InputMethodManager {
Handler vh = view.getHandler();
if (vh == null) {
// If the view doesn't have a handler, something has changed out
- // from under us, so just bail.
- if (DEBUG) Log.v(TAG, "ABORT input: no handler for view!");
+ // from under us, so just close the current input.
+ // If we don't close the current input, the current input method can remain on the
+ // screen without a connection.
+ if (DEBUG) Log.v(TAG, "ABORT input: no handler for view! Close current input.");
+ closeCurrentInput();
return false;
}
if (vh.getLooper() != Looper.myLooper()) {