Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch BadTokenException and continue." into jb-mr2-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-03-15 18:59:51 +00:00
committed by Android (Google) Code Review
parent faf0e89ce3 e4bbb1cc45
commit 8dfe99ce20
4 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/inputmethodservice/IInputMethodWrapper.java
View File

@@ -54,7 +54,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
implements HandlerCaller.Callback { implements HandlerCaller.Callback {
private static final String TAG = "InputMethodWrapper"; private static final String TAG = "InputMethodWrapper";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final int DO_DUMP = 1; private static final int DO_DUMP = 1;
private static final int DO_ATTACH_TOKEN = 10; private static final int DO_ATTACH_TOKEN = 10;
private static final int DO_SET_INPUT_CONTEXT = 20; private static final int DO_SET_INPUT_CONTEXT = 20;
@@ -284,12 +284,6 @@ class IInputMethodWrapper extends IInputMethod.Stub
flags, resultReceiver)); flags, resultReceiver));
} }
@Override
public void removeSoftInputMessages() {
mCaller.removeMessages(DO_SHOW_SOFT_INPUT);
mCaller.removeMessages(DO_HIDE_SOFT_INPUT);
}
public void changeInputMethodSubtype(InputMethodSubtype subtype) { public void changeInputMethodSubtype(InputMethodSubtype subtype) {
mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CHANGE_INPUTMETHOD_SUBTYPE, mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CHANGE_INPUTMETHOD_SUBTYPE,
subtype)); subtype));

14
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -39,7 +39,6 @@ import android.text.method.MovementMethod;
import android.util.Log; import android.util.Log;
import android.util.PrintWriterPrinter; import android.util.PrintWriterPrinter;
import android.util.Printer; import android.util.Printer;
import android.util.Slog;
import android.view.KeyCharacterMap; import android.view.KeyCharacterMap;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -49,6 +48,7 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowManager.BadTokenException;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.view.inputmethod.CompletionInfo; import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
@@ -352,7 +352,6 @@ public class InputMethodService extends AbstractInputMethodService {
* Take care of attaching the given window token provided by the system. * Take care of attaching the given window token provided by the system.
*/ */
public void attachToken(IBinder token) { public void attachToken(IBinder token) {
Slog.i(TAG, "attachToken: Existing token=" + mToken + " new token=" + token);
if (mToken == null) { if (mToken == null) {
mToken = token; mToken = token;
mWindow.setToken(token); mWindow.setToken(token);
@@ -419,11 +418,16 @@ public class InputMethodService extends AbstractInputMethodService {
* Handle a request by the system to show the soft input area. * Handle a request by the system to show the soft input area.
*/ */
public void showSoftInput(int flags, ResultReceiver resultReceiver) { public void showSoftInput(int flags, ResultReceiver resultReceiver) {
if (true || DEBUG) Slog.v(TAG, "showSoftInput()"); if (DEBUG) Log.v(TAG, "showSoftInput()");
boolean wasVis = isInputViewShown(); boolean wasVis = isInputViewShown();
mShowInputFlags = 0; mShowInputFlags = 0;
if (onShowInputRequested(flags, false)) { if (onShowInputRequested(flags, false)) {
showWindow(true); try {
showWindow(true);
} catch (BadTokenException e) {
if (DEBUG) Log.v(TAG, "BadTokenException: IME is done.");
mWindowVisible = false;
}
} }
// If user uses hard keyboard, IME button should always be shown. // If user uses hard keyboard, IME button should always be shown.
boolean showing = onEvaluateInputViewShown(); boolean showing = onEvaluateInputViewShown();
@@ -1390,7 +1394,7 @@ public class InputMethodService extends AbstractInputMethodService {
} }
public void showWindow(boolean showInput) { public void showWindow(boolean showInput) {
if (true || DEBUG) Slog.v(TAG, "Showing window: showInput=" + showInput if (DEBUG) Log.v(TAG, "Showing window: showInput=" + showInput
+ " mShowInputRequested=" + mShowInputRequested + " mShowInputRequested=" + mShowInputRequested
+ " mWindowAdded=" + mWindowAdded + " mWindowAdded=" + mWindowAdded
+ " mWindowCreated=" + mWindowCreated + " mWindowCreated=" + mWindowCreated

36
core/java/com/android/internal/view/IInputMethod.aidl
View File

@@ -33,28 +33,26 @@ import com.android.internal.view.IInputMethodSession;
* Service). * Service).
* {@hide} * {@hide}
*/ */
interface IInputMethod { oneway interface IInputMethod {
oneway void attachToken(IBinder token); void attachToken(IBinder token);
oneway void bindInput(in InputBinding binding);
oneway void unbindInput();
oneway void startInput(in IInputContext inputContext, in EditorInfo attribute); void bindInput(in InputBinding binding);
oneway void restartInput(in IInputContext inputContext, in EditorInfo attribute); void unbindInput();
oneway void createSession(IInputMethodCallback callback); void startInput(in IInputContext inputContext, in EditorInfo attribute);
oneway void setSessionEnabled(IInputMethodSession session, boolean enabled);
oneway void revokeSession(IInputMethodSession session);
oneway void showSoftInput(int flags, in ResultReceiver resultReceiver);
oneway void hideSoftInput(int flags, in ResultReceiver resultReceiver);
void removeSoftInputMessages(); void restartInput(in IInputContext inputContext, in EditorInfo attribute);
oneway void changeInputMethodSubtype(in InputMethodSubtype subtype); void createSession(IInputMethodCallback callback);
void setSessionEnabled(IInputMethodSession session, boolean enabled);
void revokeSession(IInputMethodSession session);
void showSoftInput(int flags, in ResultReceiver resultReceiver);
void hideSoftInput(int flags, in ResultReceiver resultReceiver);
void changeInputMethodSubtype(in InputMethodSubtype subtype);
} }

30
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -1237,24 +1237,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
synchronized (mMethodMap) { synchronized (mMethodMap) {
if (mCurIntent != null && name.equals(mCurIntent.getComponent())) { if (mCurIntent != null && name.equals(mCurIntent.getComponent())) {
IInputMethod prevMethod = mCurMethod;
mCurMethod = IInputMethod.Stub.asInterface(service); mCurMethod = IInputMethod.Stub.asInterface(service);
if (mCurToken == null) { if (mCurToken == null) {
Slog.w(TAG, "Service connected without a token!"); Slog.w(TAG, "Service connected without a token!");
unbindCurrentMethodLocked(false, false); unbindCurrentMethodLocked(false, false);
return; return;
} }
// Remove messages relating to the previous service. Otherwise WindowManagerService if (DEBUG) Slog.v(TAG, "Initiating attach with token: " + mCurToken);
// will throw a BadTokenException because the old token is being removed.
if (prevMethod != null) {
try {
prevMethod.removeSoftInputMessages();
} catch (RemoteException e) {
}
}
mCaller.removeMessages(MSG_SHOW_SOFT_INPUT);
mCaller.removeMessages(MSG_HIDE_SOFT_INPUT);
if (true || DEBUG) Slog.v(TAG, "Initiating attach with token: " + mCurToken);
executeOrSendMessage(mCurMethod, mCaller.obtainMessageOO( executeOrSendMessage(mCurMethod, mCaller.obtainMessageOO(
MSG_ATTACH_TOKEN, mCurMethod, mCurToken)); MSG_ATTACH_TOKEN, mCurMethod, mCurToken));
if (mCurClient != null) { if (mCurClient != null) {
@@ -1700,7 +1689,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
} }
if (true || DEBUG) Slog.v(TAG, "Client requesting input be shown"); if (DEBUG) Slog.v(TAG, "Client requesting input be shown");
return showCurrentInputLocked(flags, resultReceiver); return showCurrentInputLocked(flags, resultReceiver);
} }
} finally { } finally {
@@ -1724,8 +1713,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
boolean res = false; boolean res = false;
if (mCurMethod != null) { if (mCurMethod != null) {
if (true ||DEBUG) Slog.d(TAG, "showCurrentInputLocked: mCurToken=" + mCurToken, if (DEBUG) Slog.d(TAG, "showCurrentInputLocked: mCurToken=" + mCurToken);
new RuntimeException("here").fillInStackTrace());
executeOrSendMessage(mCurMethod, mCaller.obtainMessageIOO( executeOrSendMessage(mCurMethod, mCaller.obtainMessageIOO(
MSG_SHOW_SOFT_INPUT, getImeShowFlags(), mCurMethod, MSG_SHOW_SOFT_INPUT, getImeShowFlags(), mCurMethod,
resultReceiver)); resultReceiver));
@@ -1797,13 +1785,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
boolean hideCurrentInputLocked(int flags, ResultReceiver resultReceiver) { boolean hideCurrentInputLocked(int flags, ResultReceiver resultReceiver) {
if ((flags&InputMethodManager.HIDE_IMPLICIT_ONLY) != 0 if ((flags&InputMethodManager.HIDE_IMPLICIT_ONLY) != 0
&& (mShowExplicitlyRequested || mShowForced)) { && (mShowExplicitlyRequested || mShowForced)) {
if (true ||DEBUG) Slog.v(TAG, if (DEBUG) Slog.v(TAG, "Not hiding: explicit show not cancelled by non-explicit hide");
"Not hiding: explicit show not cancelled by non-explicit hide");
return false; return false;
} }
if (mShowForced && (flags&InputMethodManager.HIDE_NOT_ALWAYS) != 0) { if (mShowForced && (flags&InputMethodManager.HIDE_NOT_ALWAYS) != 0) {
if (true ||DEBUG) Slog.v(TAG, if (DEBUG) Slog.v(TAG, "Not hiding: forced show not cancelled by not-always hide");
"Not hiding: forced show not cancelled by not-always hide");
return false; return false;
} }
boolean res; boolean res;
@@ -2314,7 +2300,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
case MSG_SHOW_SOFT_INPUT: case MSG_SHOW_SOFT_INPUT:
args = (SomeArgs)msg.obj; args = (SomeArgs)msg.obj;
try { try {
if (true || DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".showSoftInput(" if (DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".showSoftInput("
+ msg.arg1 + ", " + args.arg2 + ")"); + msg.arg1 + ", " + args.arg2 + ")");
((IInputMethod)args.arg1).showSoftInput(msg.arg1, (ResultReceiver)args.arg2); ((IInputMethod)args.arg1).showSoftInput(msg.arg1, (ResultReceiver)args.arg2);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -2324,7 +2310,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
case MSG_HIDE_SOFT_INPUT: case MSG_HIDE_SOFT_INPUT:
args = (SomeArgs)msg.obj; args = (SomeArgs)msg.obj;
try { try {
if (true || DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".hideSoftInput(0, " if (DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".hideSoftInput(0, "
+ args.arg2 + ")"); + args.arg2 + ")");
((IInputMethod)args.arg1).hideSoftInput(0, (ResultReceiver)args.arg2); ((IInputMethod)args.arg1).hideSoftInput(0, (ResultReceiver)args.arg2);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -2334,7 +2320,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
case MSG_ATTACH_TOKEN: case MSG_ATTACH_TOKEN:
args = (SomeArgs)msg.obj; args = (SomeArgs)msg.obj;
try { try {
if (true || DEBUG) Slog.v(TAG, "Sending attach of token: " + args.arg2); if (DEBUG) Slog.v(TAG, "Sending attach of token: " + args.arg2);
((IInputMethod)args.arg1).attachToken((IBinder)args.arg2); ((IInputMethod)args.arg1).attachToken((IBinder)args.arg2);
} catch (RemoteException e) { } catch (RemoteException e) {
} }