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

Commit 5acd2214 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Add @UserIdInt for InputMethodManagerInternal impls 

This CL adds missing @UserIdInt annotations to
InputMethodManagerInternal implementation classes.

@UserIdInt is source-level annotation. There should be no impact on
change in build artifacts.

Bug: 192412909
Test: presubmit
Change-Id: I18067fd51eff6e9dece08b17f9ea1cf6ecedda68
parent 159ae360

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

+7 −5
Original line number Diff line number Diff line
@@ -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;

                }

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

+5 −5
Original line number Diff line number Diff line
@@ -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);

        }