am ec403e8f: Merge "Call startInput on return from sleep mode" (6c477a29) · Commits · e / os / android_frameworks_base

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

+11 −13

Original line number	Diff line number	Diff line
		@@ -494,12 +494,11 @@ public final class InputMethodManager {
		mIInputContext.finishComposingText();
		} catch (RemoteException e) {
		}
		}
		// Check focus again in case that "onWindowFocus" is called before
		// handling this message.
		if (mServedView != null && mServedView.hasWindowFocus()) {
		// "finishComposingText" has been already called above. So we
		// should not call mServedInputConnection.finishComposingText here.
		// Also, please note that this handler thread could be different
		// Please note that this handler thread could be different
		// from a thread that created mServedView. That could happen
		// the current activity is running in the system process.
		// In that case, we really should not call
		@@ -509,7 +508,6 @@ public final class InputMethodManager {
		}
		}
		}
		}
		return;
		}
		case MSG_SEND_INPUT_EVENT: {