commit 4666860d655584281c1ce7b8361101ae016e4100
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 01 10:26:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 01 10:26:52 2024 +0000
tree 696a59d6b782567eabeaa177b9efefb199915bf7
parent b5eee0a940ce9bcfcf19405543d09ad0f44b0672
parent 764ee9192f5b3b58fdaa56dfd65c0494939911e8

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

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

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index ead7eb2..1e76324 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -4045,7 +4045,7 @@
             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 @@
             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)) {