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

Commit baaa9176 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary query in IMMS#switchUserOnHandlerLocked()" into main

parents 5be35d77 313a5275

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

+1 −3
Original line number Diff line number Diff line
@@ -1535,9 +1535,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        // 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())) {