Merge "Lock down RemoteInputConnectionImpl#getInputConnection()" (02ce38c2) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1381,8 +1381,7 @@ public final class InputMethodManager {
		public boolean isAcceptingText() {
		checkFocus();
		synchronized (mH) {
		return mServedInputConnection != null
		&& mServedInputConnection.getInputConnection() != null;
		return mServedInputConnection != null && !mServedInputConnection.isFinished();
		}
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -86,13 +86,17 @@ public final class RemoteInputConnectionImpl extends IInputContext.Stub {
		* @return {@link InputConnection} to which incoming IPCs will be dispatched.
		*/
		@Nullable
		public InputConnection getInputConnection() {
		private InputConnection getInputConnection() {
		synchronized (mLock) {
		return mInputConnection;
		}
		}

		private boolean isFinished() {
		/**
		* @return {@code true} until the target {@link InputConnection} receives
		* {@link InputConnection#closeConnection()} as a result of {@link #deactivate()}.
		*/
		public boolean isFinished() {
		synchronized (mLock) {
		return mFinished;
		}