Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 523fefbe authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Simplify IMMS#postInputMethodSettingUpdatedLocked() a bit 

This CL simplifies

  InputMethodManagerService#postInputMethodSettingUpdatedLocked()

a bit by explicitly having a local instance "userId" instead of using

  settings.getUserId()

as a synonym of it.

This is a mechanical refactoring CL, which should have no behavior
change.

Bug: 305849394
Test: presubmit
Flag: EXEMPT refactor
Change-Id: Idb8acd978fb6da285349841da61de018a0a7e19b
parent 2da64f9b

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

+6 −5
Original line number Diff line number Diff line
@@ -5248,7 +5248,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        }

        mMethodMapUpdateCount++;



        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.
@@ -5311,18 +5312,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();
@@ -5330,7 +5331,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")