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

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

Remove unnecessary parameter that is always true. 

This is a mechanical refactoring that removes an unnecessary parameter
that is always specified to 'true'.

No behavior change is intended.

Bug: 22859862
Change-Id: If3aef8209a355af1432ca2600bcc3a0027a6c24c
parent 540d9842

core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java

+5 −5
Original line number Diff line number Diff line
@@ -193,11 +193,11 @@ public class InputMethodSubtypeSwitchingController { 
                        });



        public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeList() {

            return getSortedInputMethodAndSubtypeList(true, false, false);

            return getSortedInputMethodAndSubtypeList(false, false);

        }



        public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeList(

                boolean showSubtypes, boolean includeAuxiliarySubtypes, boolean isScreenLocked) {

                boolean includeAuxiliarySubtypes, boolean isScreenLocked) {

            final ArrayList<ImeSubtypeListItem> imList =

                    new ArrayList<ImeSubtypeListItem>();

            final HashMap<InputMethodInfo, List<InputMethodSubtype>> immis =
@@ -224,7 +224,7 @@ public class InputMethodSubtypeSwitchingController { 
                    enabledSubtypeSet.add(String.valueOf(subtype.hashCode()));

                }

                final CharSequence imeLabel = imi.loadLabel(mPm);

                if (showSubtypes && enabledSubtypeSet.size() > 0) {

                if (enabledSubtypeSet.size() > 0) {

                    final int subtypeCount = imi.getSubtypeCount();

                    if (DEBUG) {

                        Slog.v(TAG, "Add subtypes: " + subtypeCount + ", " + imi.getId());
@@ -546,10 +546,10 @@ public class InputMethodSubtypeSwitchingController { 
        return mController.getNextInputMethod(onlyCurrentIme, imi, subtype);

    }



    public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeListLocked(boolean showSubtypes,

    public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeListLocked(

            boolean includingAuxiliarySubtypes, boolean isScreenLocked) {

        return mSubtypeList.getSortedInputMethodAndSubtypeList(

                showSubtypes, includingAuxiliarySubtypes, isScreenLocked);

                includingAuxiliarySubtypes, isScreenLocked);

    }



    public void dump(final Printer pw) {

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

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


            final List<ImeSubtypeListItem> imList =

                    mSwitchingController.getSortedInputMethodAndSubtypeListLocked(

                            true /* showSubtypes */, showAuxSubtypes, isScreenLocked);

                            showAuxSubtypes, isScreenLocked);



            if (lastInputMethodSubtypeId == NOT_A_SUBTYPE_ID) {

                final InputMethodSubtype currentSubtype = getCurrentInputMethodSubtypeLocked();