Merge "Remove unnecessary query in IMMS#switchUserOnHandlerLocked() (2nd try)" into main
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 333c9b58..96f525a 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -1539,9 +1539,7 @@
// and user switch would not happen at that time.
resetCurrentMethodAndClientLocked(UnbindReason.SWITCH_USER);
- final InputMethodSettings newSettings = queryInputMethodServicesInternal(mContext,
- newUserId, AdditionalSubtypeMapRepository.get(newUserId), DirectBootAwareness.AUTO);
- InputMethodSettingsRepository.put(newUserId, newSettings);
+ final InputMethodSettings newSettings = InputMethodSettingsRepository.get(newUserId);
mSettings = newSettings;
postInputMethodSettingUpdatedLocked(initialUserSwitch /* resetDefaultEnabledIme */);
if (TextUtils.isEmpty(mSettings.getSelectedInputMethod())) {
