Merge "Simplify RemoteInputConnectionImpl#finishComposingText*()" into main (11e1f80a) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/RemoteInputConnectionImpl.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -809,11 +809,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub {
		return; // cancelled
		}
		InputConnection ic = getInputConnection();
		// Note we do NOT check isActive() here, because this is safe
		// for an IME to call at any time, and we need to allow it
		// through to clean up our state after the IME has switched to
		// another client.
		if (ic == null) {
		if (ic == null \|\| !isActive()) {
		Log.w(TAG, "finishComposingTextFromImm on inactive InputConnection");
		return;
		}
		@@ -837,11 +833,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub {
		return; // cancelled
		}
		InputConnection ic = getInputConnection();
		// Note we do NOT check isActive() here, because this is safe
		// for an IME to call at any time, and we need to allow it
		// through to clean up our state after the IME has switched to
		// another client.
		if (ic == null) {
		if (ic == null && !isActive()) {
		Log.w(TAG, "finishComposingText on inactive InputConnection");
		return;
		}