summaryrefslogtreecommitdiff
path: root/core/java/android/inputmethodservice/InputMethodService.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-03-19 16:54:35 -0700
committerCraig Mautner <cmautner@google.com>2013-03-19 16:58:00 -0700
commitf403b1fe5081aae07523043eaec8f348e1c982ea (patch)
tree89b02bd47956648750007d1c765864074ab6d804 /core/java/android/inputmethodservice/InputMethodService.java
parente50d7fcd9796329bded8c39f2666b6c3ee021ff3 (diff)
Clear mWindowAdded when window was not added. DO NOT MERGE
If ViewRootImpl throws BadTokenException when adding a window, clear the indication that a window has been added. That way when the window is destroyed it doesn't try to clean it up. Fixes bug 8409506. Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 5a9cde170b70..2b15afdde9ea 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -427,6 +427,7 @@ public class InputMethodService extends AbstractInputMethodService {
} catch (BadTokenException e) {
if (DEBUG) Log.v(TAG, "BadTokenException: IME is done.");
mWindowVisible = false;
+ mWindowAdded = false;
}
}
// If user uses hard keyboard, IME button should always be shown.