Remove WindowManager messages from remote queue.

When a new IME is attached it is not enough to remove the
WindowManager messages from the local queue, but the ones in
the previous IME queue must also be removed.

Fixes bug 8263462.

Change-Id: I9e916c6052a83dc7691bcba0b6ab8328b9b7cc36

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index 2d67875c6084..d59c7b819df3 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -284,6 +284,12 @@ class IInputMethodWrapper extends IInputMethod.Stub
                 flags, resultReceiver));
     }
 
+    @Override
+    public void removeSoftInputMessages() {
+        mCaller.removeMessages(DO_SHOW_SOFT_INPUT);
+        mCaller.removeMessages(DO_HIDE_SOFT_INPUT);
+    }
+
     public void changeInputMethodSubtype(InputMethodSubtype subtype) {
         mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CHANGE_INPUTMETHOD_SUBTYPE,
                 subtype));