summaryrefslogtreecommitdiff
path: root/core/java/android/inputmethodservice/InputMethodService.java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-05-30 13:14:47 +0900
committerSatoshi Kataoka <satok@google.com>2013-05-30 20:14:22 +0900
commitc56191f82956527acadd525b64ebcc033bc107a3 (patch)
tree89d547b4f992ca6d0a8f94f8baa09e2a7d7c9e95 /core/java/android/inputmethodservice/InputMethodService.java
parent087d2b2df78e44b92e02a241ba6e7f917f63bac6 (diff)
Resolve inconsistent conditions in InputMethodService
This change is addressing this issue by 1. call doFinishInput in onDestroy 2. fix the inconsistent condition of "mInputStarted" Bug: 9197136 Change-Id: Iefe6b284e148e31bd212b255c41cb2cf548723d7
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 4881d1433489..7f82ce3508eb 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -381,7 +381,6 @@ public class InputMethodService extends AbstractInputMethodService {
if (DEBUG) Log.v(TAG, "unbindInput(): binding=" + mInputBinding
+ " ic=" + mInputConnection);
onUnbindInput();
- mInputStarted = false;
mInputBinding = null;
mInputConnection = null;
}
@@ -719,7 +718,7 @@ public class InputMethodService extends AbstractInputMethodService {
super.onDestroy();
mRootView.getViewTreeObserver().removeOnComputeInternalInsetsListener(
mInsetsComputer);
- finishViews();
+ doFinishInput();
if (mWindowAdded) {
// Disable exit animation for the current IME window
// to avoid the race condition between the exit and enter animations