Merge "Make "ime {enable,disable} --user <userId>" consistent among users" into main (a32b8aec) · Commits · e / os / android_frameworks_base

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

+3 −29

Original line number	Diff line number	Diff line
		@@ -6696,36 +6696,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		private boolean handleShellCommandEnableDisableInputMethodInternalLocked(
		@UserIdInt int userId, String imeId, boolean enabled, PrintWriter out,
		PrintWriter error) {
		boolean failedToEnableUnknownIme = false;
		boolean previouslyEnabled = false;
		final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);
		if (userId == mCurrentUserId) {
		if (enabled && !settings.getMethodMap().containsKey(imeId)) {
		failedToEnableUnknownIme = true;
		} else {
		previouslyEnabled = setInputMethodEnabledLocked(imeId, enabled, userId);
		}
		} else {
		if (enabled) {
		if (!settings.getMethodMap().containsKey(imeId)) {
		failedToEnableUnknownIme = true;
		} else {
		final String enabledImeIdsStr = settings.getEnabledInputMethodsStr();
		final String newEnabledImeIdsStr = InputMethodUtils.concatEnabledImeIds(
		enabledImeIdsStr, imeId);
		previouslyEnabled = TextUtils.equals(enabledImeIdsStr, newEnabledImeIdsStr);
		if (!previouslyEnabled) {
		settings.putEnabledInputMethodsStr(newEnabledImeIdsStr);
		}
		}
		} else {
		previouslyEnabled =
		settings.buildAndPutEnabledInputMethodsStrRemovingId(
		new StringBuilder(),
		settings.getEnabledInputMethodsAndSubtypeList(), imeId);
		}
		}
		if (failedToEnableUnknownIme) {
		error.print("Unknown input method ");
		error.print(imeId);
		error.println(" cannot be enabled for user #" + userId);
		@@ -6734,6 +6706,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		+ " failed due to its unrecognized IME ID.");
		return false;
		}

		final boolean previouslyEnabled = setInputMethodEnabledLocked(imeId, enabled, userId);
		out.print("Input method ");
		out.print(imeId);
		out.print(": ");