Merge "Avoid passing USER_ALL to getInputMethodBindingController()" into main (2535a652) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+10 −14

Original line number	Diff line number	Diff line
		@@ -678,22 +678,18 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		}
		// sender userId can be a real user ID or USER_ALL.
		final int senderUserId = pendingResult.getSendingUserId();
		if (senderUserId != UserHandle.USER_ALL) {
		synchronized (ImfLock.class) {
		if (senderUserId != mCurrentUserId) {
		if (senderUserId != UserHandle.USER_ALL && senderUserId != mCurrentUserId) {
		// A background user is trying to hide the dialog. Ignore.
		return;
		}
		}
		}
		final int userId = mCurrentUserId;
		if (mNewInputMethodSwitcherMenuEnabled) {
		synchronized (ImfLock.class) {
		final var bindingController = getInputMethodBindingController(senderUserId);
		mMenuControllerNew.hide(bindingController.getCurTokenDisplayId(),
		senderUserId);
		}
		final var bindingController = getInputMethodBindingController(userId);
		mMenuControllerNew.hide(bindingController.getCurTokenDisplayId(), userId);
		} else {
		mMenuController.hideInputMethodMenu(senderUserId);
		mMenuController.hideInputMethodMenuLocked(userId);
		}
		}
		} else {
		Slog.w(TAG, "Unexpected intent " + intent);