Merge "Simplify IMMS#postInputMethodSettingUpdatedLocked() a bit" into main (b9536e65) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -5241,7 +5241,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		return;
		}

		final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);
		final int userId = mCurrentUserId;
		final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

		boolean reenableMinimumNonAuxSystemImes = false;
		// TODO: The following code should find better place to live.
		@@ -5304,18 +5305,18 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		updateDefaultVoiceImeIfNeededLocked();

		// TODO: Instantiate mSwitchingController for each user.
		if (settings.getUserId() == mSwitchingController.getUserId()) {
		if (userId == mSwitchingController.getUserId()) {
		mSwitchingController.resetCircularListLocked(settings.getMethodMap());
		} else {
		mSwitchingController = InputMethodSubtypeSwitchingController.createInstanceLocked(
		mContext, settings.getMethodMap(), mCurrentUserId);
		}
		// TODO: Instantiate mHardwareKeyboardShortcutController for each user.
		if (settings.getUserId() == mHardwareKeyboardShortcutController.getUserId()) {
		if (userId == mHardwareKeyboardShortcutController.getUserId()) {
		mHardwareKeyboardShortcutController.reset(settings.getMethodMap());
		} else {
		mHardwareKeyboardShortcutController = new HardwareKeyboardShortcutController(
		settings.getMethodMap(), settings.getUserId());
		settings.getMethodMap(), userId);
		}

		sendOnNavButtonFlagsChangedLocked();
		@@ -5323,7 +5324,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		// Notify InputMethodListListeners of the new installed InputMethods.
		final List<InputMethodInfo> inputMethodList = settings.getMethodList();
		mHandler.obtainMessage(MSG_DISPATCH_ON_INPUT_METHOD_LIST_UPDATED,
		settings.getUserId(), 0 /* unused */, inputMethodList).sendToTarget();
		userId, 0 /* unused */, inputMethodList).sendToTarget();
		}

		@GuardedBy("ImfLock.class")