Merge "Make IMMS#onActionLocaleChanged() multi-user aware" into main (052698ae) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -648,7 +648,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		* Handles {@link Intent#ACTION_LOCALE_CHANGED}.
		*
		* <p>Note: For historical reasons, {@link Intent#ACTION_LOCALE_CHANGED} has been sent to all
		* the users. We should ignore this event if this is about any background user's locale.</p>
		* the users.</p>
		*/
		void onActionLocaleChanged(@NonNull LocaleList prevLocales, @NonNull LocaleList newLocales) {
		if (DEBUG) {
		@@ -665,15 +665,16 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		AdditionalSubtypeMapRepository.get(userId),
		DirectBootAwareness.AUTO);
		InputMethodSettingsRepository.put(userId, settings);
		}
		// TODO(b/305849394): Dispatch this to non-current users.
		final int userId = mCurrentUserId;

		if (mConcurrentMultiUserModeEnabled \|\| userId == mCurrentUserId) {
		postInputMethodSettingUpdatedLocked(true /* resetDefaultEnabledIme */, userId);
		// If the locale is changed, needs to reset the default ime
		resetDefaultImeLocked(mContext, userId);
		updateFromSettingsLocked(true, userId);
		}
		}
		}
		}

		final class MyPackageMonitor extends PackageMonitor {
		/**