Merge "Inline 'reloadInputMethodStr' in InputMethodUtils.java" into main (9884e951) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -5275,7 +5275,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		return true;
		}
		}
		mSettings.appendAndPutEnabledInputMethodLocked(id, false);
		mSettings.appendAndPutEnabledInputMethodLocked(id);
		// Previous state was disabled.
		return false;
		} else {
		@@ -5612,7 +5612,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		if (enabled) {
		if (!settings.getEnabledInputMethodListLocked().contains(
		methodMap.get(imeId))) {
		settings.appendAndPutEnabledInputMethodLocked(imeId, false);
		settings.appendAndPutEnabledInputMethodLocked(imeId);
		}
		} else {
		settings.buildAndPutEnabledInputMethodsStrRemovingIdLocked(
		@@ -6357,7 +6357,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		}
		}
		if (!previouslyEnabled) {
		settings.appendAndPutEnabledInputMethodLocked(imeId, false);
		settings.appendAndPutEnabledInputMethodLocked(imeId);
		}
		}
		} else {
		@@ -6501,7 +6501,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		settings.putEnabledInputMethodsStr("");
		nextEnabledImes.forEach(
		imi -> settings.appendAndPutEnabledInputMethodLocked(
		imi.getId(), false));
		imi.getId()));

		// Reset selected IME.
		settings.putSelectedInputMethod(nextIme);

+1 −4

Original line number	Diff line number	Diff line
		@@ -362,10 +362,7 @@ final class InputMethodUtils {
		return result;
		}

		void appendAndPutEnabledInputMethodLocked(String id, boolean reloadInputMethodStr) {
		if (reloadInputMethodStr) {
		getEnabledInputMethodsStr();
		}
		void appendAndPutEnabledInputMethodLocked(String id) {
		if (TextUtils.isEmpty(mEnabledInputMethodsStrCache)) {
		// Add in the newly enabled input method.
		putEnabledInputMethodsStr(id);