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

Commit 153aaa5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make switchToInputMethodLocked concurrent multi-user aware" into main

parents 96b44541 22992d58

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

+1 −1
Original line number Diff line number Diff line
@@ -5539,7 +5539,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    @GuardedBy("ImfLock.class")

    private boolean switchToInputMethodLocked(String imeId, @UserIdInt int userId) {

        final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

        if (userId == mCurrentUserId) {

        if (mExperimentalConcurrentMultiUserModeEnabled || userId == mCurrentUserId) {

            if (!settings.getMethodMap().containsKey(imeId)

                    || !settings.getEnabledInputMethodList()

                    .contains(settings.getMethodMap().get(imeId))) {