Merge changes from topic "kyatoh-b221483132-tm-dev" into tm-dev

* changes:
  Do not cleanup IME window if show is requested.
  Notify IMMS synchronously on IME insets hidden.

1 files changed, 0 insertions, 12 deletions

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 4fdd53425328..a6ed42348af6 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1058,10 +1058,6 @@ public class InputMethodService extends AbstractInputMethodService {
         return viewRoot == null ? null : viewRoot.getInputToken();
     }
 
-    private void notifyImeHidden() {
-        requestHideSelf(0);
-    }
-
     private void scheduleImeSurfaceRemoval() {
         if (mShowInputRequested || mWindowVisible || mWindow == null
                 || mImeSurfaceScheduledForRemoval) {
@@ -1225,14 +1221,6 @@ public class InputMethodService extends AbstractInputMethodService {
         }
 
         /**
-         * Notify IME that window is hidden.
-         * @hide
-         */
-        public final void notifyImeHidden() {
-            InputMethodService.this.notifyImeHidden();
-        }
-
-        /**
          * Notify IME that surface can be now removed.
          * @hide
          */