Merge "Make "ime reset --user <userId>" consistent among users" into main (3ecb6a59) · Commits · e / os / android_frameworks_base

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

+36 −56

Original line number	Diff line number	Diff line
		@@ -6814,7 +6814,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		final String nextIme;
		final List<InputMethodInfo> nextEnabledImes;
		final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);
		if (userId == mCurrentUserId) {
		final var userData = getUserData(userId);
		if (Flags.refactorInsetsController()) {
		if (userData.mImeBindingState != null
		@@ -6856,25 +6855,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		settings.getEnabledInputMethodList());
		nextIme = settings.getSelectedInputMethod();
		nextEnabledImes = settings.getEnabledInputMethodList();
		} else {
		nextEnabledImes = InputMethodInfoUtils.getDefaultEnabledImes(mContext,
		settings.getMethodList());
		nextIme = InputMethodInfoUtils.getMostApplicableDefaultIME(
		nextEnabledImes).getId();

		// Reset enabled IMEs.
		final String[] nextEnabledImeIds = new String[nextEnabledImes.size()];
		for (int i = 0; i < nextEnabledImeIds.length; ++i) {
		nextEnabledImeIds[i] = nextEnabledImes.get(i).getId();
		}
		settings.putEnabledInputMethodsStr(InputMethodUtils.concatEnabledImeIds(
		"", nextEnabledImeIds));

		// Reset selected IME.
		settings.putSelectedInputMethod(nextIme);
		settings.putSelectedDefaultDeviceInputMethod(null);
		settings.putSelectedSubtype(NOT_A_SUBTYPE_ID);
		}
		out.println("Reset current and enabled IMEs for user #" + userId);
		out.println(" Selected: " + nextIme);
		nextEnabledImes.forEach(ime -> out.println(" Enabled: " + ime.getId()));