Merge "Fix session race due to pending user-switch task" into rvc-dev (243ac3d3) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2480,6 +2480,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	void onSessionCreated(IInputMethod method, IInputMethodSession session,		void onSessionCreated(IInputMethod method, IInputMethodSession session,
	InputChannel channel) {		InputChannel channel) {
	synchronized (mMethodMap) {		synchronized (mMethodMap) {
			if (mUserSwitchHandlerTask != null) {
			// We have a pending user-switching task so it's better to just ignore this session.
			channel.dispose();
			return;
			}
	if (mCurMethod != null && method != null		if (mCurMethod != null && method != null
	&& mCurMethod.asBinder() == method.asBinder()) {		&& mCurMethod.asBinder() == method.asBinder()) {
	if (mCurClient != null) {		if (mCurClient != null) {