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

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

Merge "Correctly propagate userId in IMMS#setInputMethod{,AndSubtype}" into main

parents b5eee0a9 764ee919

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

+2 −2
Original line number Diff line number Diff line
@@ -4045,7 +4045,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            if (!calledWithValidTokenLocked(token, userId)) {

                return;

            }

            final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);

            final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

            final InputMethodInfo imi = settings.getMethodMap().get(id);

            if (imi == null || !canCallerAccessInputMethod(

                    imi.getPackageName(), callingUid, userId, settings)) {
@@ -4063,7 +4063,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            if (!calledWithValidTokenLocked(token, userId)) {

                return;

            }

            final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);

            final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

            final InputMethodInfo imi = settings.getMethodMap().get(id);

            if (imi == null || !canCallerAccessInputMethod(

                    imi.getPackageName(), callingUid, userId, settings)) {