am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. (804aa297) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -336,6 +336,7 @@ public final class InputMethodManager {
		}
		case MSG_UNBIND: {
		final int sequence = msg.arg1;
		boolean startInput = false;
		synchronized (mH) {
		if (mBindSequence == sequence) {
		if (false) {
		@@ -356,9 +357,12 @@ public final class InputMethodManager {
		mServedConnecting = true;
		}
		if (mActive) {
		startInputInner();
		startInput = true;
		}
		}
		}
		if (startInput) {
		startInputInner();
		}
		return;
		}
		@@ -1209,12 +1213,13 @@ public final class InputMethodManager {
		mService.windowGainedFocus(mClient, rootView.getWindowToken(),
		focusedView != null, isTextEditor, softInputMode, first,
		windowFlags);
		if (startInput) {
		startInputInner();
		}
		} catch (RemoteException e) {
		}
		}

		if (startInput) {
		startInputInner();
		}
		}

		/** @hide */