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

Commit 13fa12ed authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Revert "Remove unnecessary query in IMMS#switchUserOnHandlerLocked()" 

This reverts commit 313a5275.

This fixes a lock contention that added a regression in boot time.

Fix: 329414077
Bug: 309837937
Bug: 329163064
Test: n/a
Change-Id: Ie65a60279f36deba82f77520926d81e8a801f1dd
parent 4a81244a

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

+3 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,9 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        // and user switch would not happen at that time.

        resetCurrentMethodAndClientLocked(UnbindReason.SWITCH_USER);



        final InputMethodSettings newSettings = InputMethodSettingsRepository.get(newUserId);

        final InputMethodSettings newSettings = queryInputMethodServicesInternal(mContext,

                newUserId, AdditionalSubtypeMapRepository.get(newUserId), DirectBootAwareness.AUTO);

        InputMethodSettingsRepository.put(newUserId, newSettings);

        mSettings = newSettings;

        postInputMethodSettingUpdatedLocked(initialUserSwitch /* resetDefaultEnabledIme */);

        if (TextUtils.isEmpty(mSettings.getSelectedInputMethod())) {