commit c6da8d29f288bb457e7e9213398fe1582bfe573c
author Shawn Pearce <sop@google.com> Tue Mar 12 21:58:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 12 22:07:03 2013 +0000
tree c1aac53e136d7a8ce8e7dd61989f004ac3cc3102
parent 8818d84a3540de6e53e5d82e2112292102574118
parent 274323ce8fa11e39ba66e9874c0a576e58046b1b

Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 6ba5cff..01f7544 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1243,6 +1243,10 @@
                     unbindCurrentMethodLocked(false, false);
                     return;
                 }
+                // Remove commands relating to the previous service. Otherwise WindowManagerService
+                // will reject the command because the token attached to these messages is invalid.
+                mCaller.removeMessages(MSG_SHOW_SOFT_INPUT);
+                mCaller.removeMessages(MSG_HIDE_SOFT_INPUT);
                 if (DEBUG) Slog.v(TAG, "Initiating attach with token: " + mCurToken);
                 executeOrSendMessage(mCurMethod, mCaller.obtainMessageOO(
                         MSG_ATTACH_TOKEN, mCurMethod, mCurToken));