diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java
index 9a53d837f25b1..80c83e97256e7 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java
@@ -162,28 +162,30 @@ public abstract class InputMethodManagerInternal {
                 }
 
                 @Override
-                public List<InputMethodInfo> getInputMethodListAsUser(int userId) {
+                public List<InputMethodInfo> getInputMethodListAsUser(@UserIdInt int userId) {
                     return Collections.emptyList();
                 }
 
                 @Override
-                public List<InputMethodInfo> getEnabledInputMethodListAsUser(int userId) {
+                public List<InputMethodInfo> getEnabledInputMethodListAsUser(
+                        @UserIdInt int userId) {
                     return Collections.emptyList();
                 }
 
                 @Override
-                public void onCreateInlineSuggestionsRequest(int userId,
+                public void onCreateInlineSuggestionsRequest(@UserIdInt int userId,
                         InlineSuggestionsRequestInfo requestInfo,
                         IInlineSuggestionsRequestCallback cb) {
                 }
 
                 @Override
-                public boolean switchToInputMethod(String imeId, int userId) {
+                public boolean switchToInputMethod(String imeId, @UserIdInt int userId) {
                     return false;
                 }
 
                 @Override
-                public boolean setInputMethodEnabled(String imeId, boolean enabled, int userId) {
+                public boolean setInputMethodEnabled(String imeId, boolean enabled,
+                        @UserIdInt int userId) {
                     return false;
                 }
 
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index c6a206bfff52a..936b1a20e3269 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -4977,28 +4977,28 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
         }
 
         @Override
-        public List<InputMethodInfo> getInputMethodListAsUser(int userId) {
+        public List<InputMethodInfo> getInputMethodListAsUser(@UserIdInt int userId) {
             return mService.getInputMethodListAsUser(userId);
         }
 
         @Override
-        public List<InputMethodInfo> getEnabledInputMethodListAsUser(int userId) {
+        public List<InputMethodInfo> getEnabledInputMethodListAsUser(@UserIdInt int userId) {
             return mService.getEnabledInputMethodListAsUser(userId);
         }
 
         @Override
-        public void onCreateInlineSuggestionsRequest(int userId,
+        public void onCreateInlineSuggestionsRequest(@UserIdInt int userId,
                 InlineSuggestionsRequestInfo requestInfo, IInlineSuggestionsRequestCallback cb) {
             mService.onCreateInlineSuggestionsRequest(userId, requestInfo, cb);
         }
 
         @Override
-        public boolean switchToInputMethod(String imeId, int userId) {
+        public boolean switchToInputMethod(String imeId, @UserIdInt int userId) {
             return mService.switchToInputMethod(imeId, userId);
         }
 
         @Override
-        public boolean setInputMethodEnabled(String imeId, boolean enabled, int userId) {
+        public boolean setInputMethodEnabled(String imeId, boolean enabled, @UserIdInt int userId) {
             return mService.setInputMethodEnabled(imeId, enabled, userId);
         }