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

Commit f927753d authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Remove an unused param from InputMethodSettings constructor 

"methodList" parameter in the constructor of InputMethodSettings is
not used.  This CL removes it in favor of simplicity.

This is a mechanical refactoring.  There should be no behavior change.

Bug: 123379418
Test: make -j checkbuild
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Ifd987bf57d6ed5622e9091157b1933f6da3ff181
parent 1c66301b

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

+3 −3
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        // mSettings should be created before buildInputMethodListLocked

        mSettings = new InputMethodSettings(

                mRes, context.getContentResolver(), mMethodMap, mMethodList, userId, !mSystemReady);

                mRes, context.getContentResolver(), mMethodMap, userId, !mSystemReady);



        updateCurrentProfileIds();

        AdditionalSubtypeUtils.load(mAdditionalSubtypeMap, userId);
@@ -1694,7 +1694,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, methodMap,

                methodList);

        final InputMethodSettings settings = new InputMethodSettings(mContext.getResources(),

                mContext.getContentResolver(), methodMap, methodList, userId, true);

                mContext.getContentResolver(), methodMap, userId, true);

        return settings.getEnabledInputMethodListLocked();

    }
@@ -1750,7 +1750,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            return Collections.emptyList();

        }

        final InputMethodSettings settings = new InputMethodSettings(mContext.getResources(),

                mContext.getContentResolver(), methodMap, methodList, userId, true);

                mContext.getContentResolver(), methodMap, userId, true);

        return settings.getEnabledInputMethodSubtypeListLocked(

                mContext, imi, allowsImplicitlySelectedSubtypes);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -799,8 +799,8 @@ final class InputMethodUtils { 
        }



        InputMethodSettings(Resources res, ContentResolver resolver,

                ArrayMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList,

                @UserIdInt int userId, boolean copyOnWrite) {

                ArrayMap<String, InputMethodInfo> methodMap, @UserIdInt int userId,

                boolean copyOnWrite) {

            mRes = res;

            mResolver = resolver;

            mMethodMap = methodMap;