Merge "Remove redundant calls of IMMS#getInputMethodBindingController()" into main (19a9a180) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -89,8 +89,8 @@ final class DefaultImeVisibilityApplier {
		void performShowIme(IBinder showInputToken, @NonNull ImeTracker.Token statsToken,
		@InputMethod.ShowFlags int showFlags, ResultReceiver resultReceiver,
		@SoftInputShowHideReason int reason, @UserIdInt int userId) {
		final var bindingController = mService.getInputMethodBindingController(userId);
		final var userData = mService.getUserData(userId);
		final var bindingController = userData.mBindingController;
		final IInputMethodInvoker curMethod = bindingController.getCurMethod();
		if (curMethod != null) {
		if (DEBUG) {
		@@ -128,9 +128,9 @@ final class DefaultImeVisibilityApplier {
		void performHideIme(IBinder hideInputToken, @NonNull ImeTracker.Token statsToken,
		ResultReceiver resultReceiver, @SoftInputShowHideReason int reason,
		@UserIdInt int userId) {
		final var bindingController = mService.getInputMethodBindingController(userId);
		final IInputMethodInvoker curMethod = bindingController.getCurMethod();
		final var userData = mService.getUserData(userId);
		final var bindingController = userData.mBindingController;
		final IInputMethodInvoker curMethod = bindingController.getCurMethod();
		if (curMethod != null) {
		// The IME will report its visible state again after the following message finally
		// delivered to the IME process as an IPC. Hence the inconsistency between
		@@ -171,8 +171,8 @@ final class DefaultImeVisibilityApplier {
		void applyImeVisibility(IBinder windowToken, @Nullable ImeTracker.Token statsToken,
		@ImeVisibilityStateComputer.VisibilityState int state,
		@SoftInputShowHideReason int reason, @UserIdInt int userId) {
		final var bindingController = mService.getInputMethodBindingController(userId);
		final var userData = mService.getUserData(userId);
		final var bindingController = userData.mBindingController;
		final int displayIdToShowIme = bindingController.getDisplayIdToShowIme();
		switch (state) {
		case STATE_SHOW_IME:

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

+27 −27

Original line number	Diff line number	Diff line
		@@ -1726,7 +1726,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		SoftInputShowHideReason.HIDE_REMOVE_CLIENT, userId);
		if (userData.mBoundToMethod) {
		userData.mBoundToMethod = false;
		final var userBindingController = getInputMethodBindingController(userId);
		final var userBindingController = userData.mBindingController;
		IInputMethodInvoker curMethod = userBindingController.getCurMethod();
		if (curMethod != null) {
		// When we unbind input, we are unbinding the client, so we always
		@@ -1758,7 +1758,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		Slog.v(TAG, "unbindCurrentInputLocked: client="
		+ userData.mCurClient.mClient.asBinder());
		}
		final var bindingController = getInputMethodBindingController(userId);
		final var bindingController = userData.mBindingController;
		if (userData.mBoundToMethod) {
		userData.mBoundToMethod = false;
		IInputMethodInvoker curMethod = bindingController.getCurMethod();
		@@ -1844,8 +1844,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		@NonNull
		InputBindResult attachNewInputLocked(@StartInputReason int startInputReason, boolean initial,
		@UserIdInt int userId) {
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		if (!userData.mBoundToMethod) {
		bindingController.getCurMethod().bindInput(userData.mCurClient.mBinding);
		userData.mBoundToMethod = true;
		@@ -2316,8 +2316,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		channel.dispose();
		return;
		}
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		IInputMethodInvoker curMethod = bindingController.getCurMethod();
		if (curMethod != null && method != null
		&& curMethod.asBinder() == method.asBinder()) {
		@@ -2745,8 +2745,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.

		@GuardedBy("ImfLock.class")
		private void updateSystemUiLocked(int vis, int backDisposition, @UserIdInt int userId) {
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		final var curToken = bindingController.getCurToken();
		if (curToken == null) {
		return;
		@@ -2844,11 +2844,11 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		settings.putSelectedInputMethod(id);
		}
		}
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		bindingController.setSelectedMethodId(id);

		// Also re-initialize controllers.
		final var userData = getUserData(userId);
		userData.mSwitchingController.resetCircularListLocked(mContext, settings);
		userData.mHardwareKeyboardShortcutController.update(settings);
		}
		@@ -2885,7 +2885,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		}
		}

		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		if (bindingController.getDeviceIdToShowIme() == DEVICE_ID_DEFAULT) {
		String ime = SecureSettingsWrapper.getString(
		Settings.Secure.DEFAULT_INPUT_METHOD, null, userId);
		@@ -2925,7 +2926,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		resetCurrentMethodAndClientLocked(UnbindReason.NO_IME, userId);
		}

		final var userData = getUserData(userId);
		userData.mSwitchingController.resetCircularListLocked(mContext, settings);
		userData.mHardwareKeyboardShortcutController.update(settings);
		sendOnNavButtonFlagsChangedLocked(userData);
		@@ -3407,8 +3407,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		mVisibilityStateComputer.requestImeVisibility(windowToken, true);

		// Ensure binding the connection when IME is going to show.
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		bindingController.setCurrentMethodVisible();
		final IInputMethodInvoker curMethod = bindingController.getCurMethod();
		ImeTracker.forLogging().onCancelled(userData.mCurStatsToken,
		@@ -3541,7 +3541,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		boolean hideCurrentInputLocked(IBinder windowToken, @NonNull ImeTracker.Token statsToken,
		@InputMethodManager.HideFlags int flags, @Nullable ResultReceiver resultReceiver,
		@SoftInputShowHideReason int reason, @UserIdInt int userId) {
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		if (!mVisibilityStateComputer.canHideIme(statsToken, flags)) {
		return false;
		}
		@@ -3554,7 +3555,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		// since Android Eclair. That's why we need to accept IMM#hideSoftInput() even when only
		// IMMS#InputShown indicates that the software keyboard is shown.
		// TODO(b/246309664): Clean up IMMS#mImeWindowVis
		final var userData = getUserData(userId);
		IInputMethodInvoker curMethod = bindingController.getCurMethod();
		final boolean shouldHideSoftInput = curMethod != null
		&& (isInputShownLocked()
		@@ -3634,6 +3634,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		Slog.w(TAG, "User #" + userId + " is not running.");
		return InputBindResult.INVALID_USER;
		}
		final var userData = getUserData(userId);
		try {
		Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER,
		"IMMS.startInputOrWindowGainedFocus");
		@@ -3641,7 +3642,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		"InputMethodManagerService#startInputOrWindowGainedFocus", mDumper);
		final InputBindResult result;
		synchronized (ImfLock.class) {
		final var bindingController = getInputMethodBindingController(userId);
		final var bindingController = userData.mBindingController;
		// If the system is not yet ready, we shouldn't be running third party code.
		if (!mSystemReady) {
		return new InputBindResult(
		@@ -3706,7 +3707,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		final boolean shouldClearFlag =
		mImePlatformCompatUtils.shouldClearShowForcedFlag(cs.mUid);
		final boolean showForced = mVisibilityStateComputer.mShowForced;
		final var userData = getUserData(userId);
		if (userData.mImeBindingState.mFocusedWindow != windowToken
		&& showForced && shouldClearFlag) {
		mVisibilityStateComputer.mShowForced = false;
		@@ -4554,8 +4554,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		private void dumpDebug(ProtoOutputStream proto, long fieldId) {
		synchronized (ImfLock.class) {
		final int userId = mCurrentUserId;
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		final long token = proto.start(fieldId);
		proto.write(CUR_METHOD_ID, bindingController.getSelectedMethodId());
		proto.write(CUR_SEQ, bindingController.getSequenceNumber());
		@@ -4688,8 +4688,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		@UserIdInt int userId) {
		final IBinder requestToken = mVisibilityStateComputer.getWindowTokenFrom(requestImeToken,
		userId);
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		final WindowManagerInternal.ImeTargetInfo info =
		mWindowManagerInternal.onToggleImeRequested(
		show, userData.mImeBindingState.mFocusedWindow, requestToken,
		@@ -5031,8 +5031,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		final var handwritingRequest = (HandwritingRequest) msg.obj;
		synchronized (ImfLock.class) {
		final int userId = handwritingRequest.userId;
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		IInputMethodInvoker curMethod = bindingController.getCurMethod();
		if (curMethod == null \|\| userData.mImeBindingState.mFocusedWindow == null) {
		return true;
		@@ -5089,12 +5089,12 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		synchronized (ImfLock.class) {
		// TODO(b/305849394): Support multiple IMEs.
		final int userId = mCurrentUserId;
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		mIsInteractive = interactive;
		updateSystemUiLocked(
		interactive ? bindingController.getImeWindowVis() : 0,
		bindingController.getBackDisposition(), userId);
		final var userData = getUserData(userId);
		// Inform the current client of the change in active status
		if (userData.mCurClient == null \|\| userData.mCurClient.mClient == null) {
		return;
		@@ -5772,7 +5772,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		if (displayId != bindingController.getCurTokenDisplayId()) {
		return false;
		}
		curHostInputToken = getInputMethodBindingController(userId).getCurHostInputToken();
		curHostInputToken = bindingController.getCurHostInputToken();
		if (curHostInputToken == null) {
		return false;
		}
		@@ -5828,8 +5828,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		public void onSessionForAccessibilityCreated(int accessibilityConnectionId,
		IAccessibilityInputMethodSession session, @UserIdInt int userId) {
		synchronized (ImfLock.class) {
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		// TODO(b/305829876): Implement user ID verification
		if (userData.mCurClient != null) {
		clearClientSessionForAccessibilityLocked(userData.mCurClient,
		@@ -5866,8 +5866,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		public void unbindAccessibilityFromCurrentClient(int accessibilityConnectionId,
		@UserIdInt int userId) {
		synchronized (ImfLock.class) {
		final var bindingController = getInputMethodBindingController(userId);
		final var userData = getUserData(userId);
		final var bindingController = userData.mBindingController;
		// TODO(b/305829876): Implement user ID verification
		if (userData.mCurClient != null) {
		if (DEBUG) {
		@@ -5935,7 +5935,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.

		synchronized (ImfLock.class) {
		final int uid = Binder.getCallingUid();
		final var bindingController = getInputMethodBindingController(imeUserId);
		final var userData = getUserData(imeUserId);
		final var bindingController = userData.mBindingController;
		if (bindingController.getSelectedMethodId() == null) {
		return null;
		}
		@@ -5947,7 +5948,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		// We cannot simply distinguish a bad IME that reports an arbitrary package name from
		// an unfortunate IME whose internal state is already obsolete due to the asynchronous
		// nature of our system. Let's compare it with our internal record.
		final var userData = getUserData(imeUserId);
		final var curPackageName = userData.mCurEditorInfo != null
		? userData.mCurEditorInfo.packageName : null;
		if (!TextUtils.equals(curPackageName, packageName)) {
		@@ -6106,8 +6106,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		p.println(" pid=" + c.mPid);
		};
		mClientController.forAllClients(clientControllerDump);
		final var bindingController = getInputMethodBindingController(mCurrentUserId);
		p.println(" mCurrentUserId=" + mCurrentUserId);
		final var bindingController = userData.mBindingController;
		p.println(" mCurrentUserId=" + userData.mUserId);
		p.println(" mCurMethodId=" + bindingController.getSelectedMethodId());
		client = userData.mCurClient;
		p.println(" mCurClient=" + client + " mCurSeq="
		@@ -6659,7 +6659,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		0 /* flags */,
		SoftInputShowHideReason.HIDE_RESET_SHELL_COMMAND, userId);
		}
		final var bindingController = getInputMethodBindingController(userId);
		final var bindingController = userData.mBindingController;
		bindingController.unbindCurrentMethod();

		// Enable default IMEs, disable others