Merge "Remove unused InputMethodManagerService#mLastSwitchUserId" into main (9c6c9980) · Commits · e / os / android_frameworks_base

core/proto/android/server/inputmethod/inputmethodmanagerservice.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ message InputMethodManagerServiceProto {
		optional string cur_token = 14;
		optional int32 cur_token_display_id = 15;
		optional bool system_ready = 16;
		optional int32 last_switch_user_id = 17;
		reserved 17; // deprecated last_switch_user_id
		optional bool have_connection = 18;
		optional bool bound_to_method = 19;
		optional bool is_interactive = 20;

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import static android.server.inputmethod.InputMethodManagerServiceProto.IME_WIND
		import static android.server.inputmethod.InputMethodManagerServiceProto.IN_FULLSCREEN_MODE;
		import static android.server.inputmethod.InputMethodManagerServiceProto.IS_INTERACTIVE;
		import static android.server.inputmethod.InputMethodManagerServiceProto.LAST_IME_TARGET_WINDOW_NAME;
		import static android.server.inputmethod.InputMethodManagerServiceProto.LAST_SWITCH_USER_ID;
		import static android.server.inputmethod.InputMethodManagerServiceProto.SHOW_IME_WITH_HARD_KEYBOARD;
		import static android.server.inputmethod.InputMethodManagerServiceProto.SYSTEM_READY;
		import static android.view.Display.DEFAULT_DISPLAY;
		@@ -276,9 +275,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		@NonNull
		private final String[] mNonPreemptibleInputMethods;

		@UserIdInt
		private int mLastSwitchUserId;

		final Context mContext;
		final Resources mRes;
		private final Handler mHandler;
		@@ -1649,8 +1645,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub

		final int userId = mActivityManagerInternal.getCurrentUserId();

		mLastSwitchUserId = userId;

		// mSettings should be created before buildInputMethodListLocked
		mSettings = InputMethodSettings.createEmptyMap(userId);

		@@ -1837,7 +1831,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		+ " selectedIme=" + mSettings.getSelectedInputMethod());
		}

		mLastSwitchUserId = newUserId;
		if (mIsInteractive && clientToBeReset != null) {
		final ClientState cs = mClientController.getClient(clientToBeReset.asBinder());
		if (cs == null) {
		@@ -4710,7 +4703,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		proto.write(CUR_TOKEN, Objects.toString(getCurTokenLocked()));
		proto.write(CUR_TOKEN_DISPLAY_ID, mCurTokenDisplayId);
		proto.write(SYSTEM_READY, mSystemReady);
		proto.write(LAST_SWITCH_USER_ID, mLastSwitchUserId);
		proto.write(HAVE_CONNECTION, hasConnectionLocked());
		proto.write(BOUND_TO_METHOD, mBoundToMethod);
		proto.write(IS_INTERACTIVE, mIsInteractive);
		@@ -6288,8 +6280,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		@ShellCommandResult
		private int onCommandWithSystemIdentity(@Nullable String cmd) {
		switch (TextUtils.emptyIfNull(cmd)) {
		case "get-last-switch-user-id":
		return mService.getLastSwitchUserId(this);
		case "tracing":
		return mService.handleShellCommandTraceInputMethod(this);
		case "ime": { // For "adb shell ime <command>".
		@@ -6403,15 +6393,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		// ----------------------------------------------------------------------
		// Shell command handlers:

		@BinderThread
		@ShellCommandResult
		private int getLastSwitchUserId(@NonNull ShellCommand shellCommand) {
		synchronized (ImfLock.class) {
		shellCommand.getOutPrintWriter().println(mLastSwitchUserId);
		return ShellCommandResult.SUCCESS;
		}
		}

		/**
		* Handles {@code adb shell ime list}.
		* @param shellCommand {@link ShellCommand} object that is handling this command.