Merge "Let IMMI#transferTouchFocusToImeWindow() take userId" into main (422af86b) · Commits · e / os / android_frameworks_base

services/autofill/java/com/android/server/autofill/ui/RemoteInlineSuggestionViewConnector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ final class RemoteInlineSuggestionViewConnector {
		final InputMethodManagerInternal inputMethodManagerInternal =
		LocalServices.getService(InputMethodManagerInternal.class);
		if (!inputMethodManagerInternal.transferTouchFocusToImeWindow(sourceInputToken,
		displayId)) {
		displayId, mUserId)) {
		Slog.e(TAG, "Cannot transfer touch focus from suggestion to IME");
		mOnErrorCallback.run();
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -150,10 +150,11 @@ public abstract class InputMethodManagerInternal {
		*
		* @param sourceInputToken the source token.
		* @param displayId the display hosting the IME window
		* @param userId the user ID this request is about
		* @return {@code true} if the transfer is successful
		*/
		public abstract boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken,
		int displayId);
		int displayId, @UserIdInt int userId);

		/**
		* Reports that IME control has transferred to the given window token, or if null that
		@@ -287,7 +288,7 @@ public abstract class InputMethodManagerInternal {

		@Override
		public boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken,
		int displayId) {
		int displayId, @UserIdInt int userId) {
		return false;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -5620,7 +5620,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.

		@Override
		public boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken,
		int displayId) {
		int displayId, @UserIdInt int userId) {
		//TODO(b/150843766): Check if Input Token is valid.
		final IBinder curHostInputToken;
		synchronized (ImfLock.class) {