Merge "Call onFinishInputView in onDestroy" (a0b1cc0f) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -687,6 +687,7 @@ public class InputMethodService extends AbstractInputMethodService {
		super.onDestroy();
		mRootView.getViewTreeObserver().removeOnComputeInternalInsetsListener(
		mInsetsComputer);
		finishViews();
		if (mWindowAdded) {
		// Disable exit animation for the current IME window
		// to avoid the race condition between the exit and enter animations
		@@ -1436,7 +1437,7 @@ public class InputMethodService extends AbstractInputMethodService {
		}
		}

		public void hideWindow() {
		private void finishViews() {
		if (mInputViewStarted) {
		if (DEBUG) Log.v(TAG, "CALL: onFinishInputView");
		onFinishInputView(false);
		@@ -1446,6 +1447,10 @@ public class InputMethodService extends AbstractInputMethodService {
		}
		mInputViewStarted = false;
		mCandidatesViewStarted = false;
		}

		public void hideWindow() {
		finishViews();
		mImm.setImeWindowStatus(mToken, 0, mBackDisposition);
		if (mWindowVisible) {
		mWindow.hide();