Merge "Remove dead code from inputmethod" into main (8441f07f) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.Context;
		import android.content.pm.PackageManagerInternal;
		import android.graphics.Region;
		import android.hardware.input.InputManager;
		import android.hardware.input.InputManagerGlobal;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;

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

+3 −30

Original line number	Diff line number	Diff line
		@@ -338,32 +338,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		return mConcurrentMultiUserModeEnabled ? callingProcessUserId : mCurrentImeUserId;
		}

		/**
		* Figures out the targetIMuser for a given {@link Binder} IPC. In case
		* {@code callingProcessUserId} is SYSTEM user, then it will return the owner of the display
		* associated with the {@code client} passed as parameter.
		*
		* @param callingProcessUserId the user ID of the calling process
		* @param client the input method client used to retrieve the user id in case
		* {@code callingProcessUserId} is assigned to SYSTEM user
		* @return the user ID to be used for this {@link Binder} call
		*/
		@GuardedBy("ImfLock.class")
		@UserIdInt
		@BinderThread
		private int resolveImeUserIdLocked(@UserIdInt int callingProcessUserId,
		@NonNull IInputMethodClient client) {
		if (mConcurrentMultiUserModeEnabled) {
		if (callingProcessUserId == UserHandle.USER_SYSTEM) {
		final var clientState = mClientController.getClient(client.asBinder());
		return mUserManagerInternal.getUserAssignedToDisplay(
		clientState.mSelfReportedDisplayId);
		}
		return callingProcessUserId;
		}
		return mCurrentImeUserId;
		}

		/**
		* Figures out the target IME user ID associated with the given {@code displayId}.
		*
		@@ -2103,7 +2077,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		(startInputFlags & StartInputFlags.INITIAL_CONNECTION) != 0, userId);
		}

		InputBindResult bindResult = tryReuseConnectionLocked(bindingController, cs, userId);
		final var bindResult = tryReuseConnectionLocked(bindingController);
		if (bindResult != null) {
		return bindResult;
		}
		@@ -2223,9 +2197,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.

		@GuardedBy("ImfLock.class")
		@Nullable
		private InputBindResult tryReuseConnectionLocked(
		@NonNull InputMethodBindingController bindingController, @NonNull ClientState cs,
		@UserIdInt int userId) {
		private static InputBindResult tryReuseConnectionLocked(
		@NonNull InputMethodBindingController bindingController) {
		if (bindingController.hasMainConnection()) {
		if (bindingController.getCurMethod() != null) {
		return new InputBindResult(