Merge "Run IMMS#onUnlockUser() also for background users" into main

1 files changed, 3 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 96ca570fe984..cd61b61d1628 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -1114,11 +1114,12 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
             final InputMethodSettings newSettings = queryInputMethodServicesInternal(mContext,
                     userId, AdditionalSubtypeMapRepository.get(userId), DirectBootAwareness.AUTO);
             InputMethodSettingsRepository.put(userId, newSettings);
-            if (mCurrentUserId == userId) {
+            if (!mConcurrentMultiUserModeEnabled) {
                 // We need to rebuild IMEs.
                 postInputMethodSettingUpdatedLocked(false /* resetDefaultEnabledIme */, userId);
                 updateInputMethodsFromSettingsLocked(true /* enabledChanged */, userId);
-            } else if (mConcurrentMultiUserModeEnabled) {
+            } else {
+                // TODO(b/352758479): Stop relying on initializeVisibleBackgroundUserLocked()
                 initializeVisibleBackgroundUserLocked(userId);
             }
         }