From e4bbb1cc451c7ebdad9f92968732fc4f6c21a70c Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 15 Mar 2013 11:38:44 -0700 Subject: Catch BadTokenException and continue. BadTokenException is a normal consequence of swapping IMEs while there is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This race condition cannot be avoided without an unacceptable lock down of InputMethodManagerService. Fixes bug 8387663. Fixes bug 8263462. Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31 --- core/java/android/inputmethodservice/IInputMethodWrapper.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'core/java/android/inputmethodservice/IInputMethodWrapper.java') diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index d59c7b819df3..11282305dd41 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -54,7 +54,7 @@ class IInputMethodWrapper extends IInputMethod.Stub implements HandlerCaller.Callback { private static final String TAG = "InputMethodWrapper"; private static final boolean DEBUG = false; - + private static final int DO_DUMP = 1; private static final int DO_ATTACH_TOKEN = 10; private static final int DO_SET_INPUT_CONTEXT = 20; @@ -284,12 +284,6 @@ 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)); -- cgit v1.2.3