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

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

Inline 'reloadInputMethodStr' in InputMethodUtils.java 

This is a mechanical code clean up for

  InputMethodSettings#appendAndPutEnabledInputMethodLocked(),

which always takes false in 'reloadInputMethodStr'.  We should be able
to safely inline that parameter without changing any existing
behavior.

Bug: 309837937
Test: presubmit
Change-Id: I804759db7727d3b0533b1d3c029d5bfc5370b374
parent a37ab237

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

+4 −4
Original line number Diff line number Diff line
@@ -5271,7 +5271,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                    return true;

                }

            }

            mSettings.appendAndPutEnabledInputMethodLocked(id, false);

            mSettings.appendAndPutEnabledInputMethodLocked(id);

            // Previous state was disabled.

            return false;

        } else {
@@ -5608,7 +5608,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                if (enabled) {

                    if (!settings.getEnabledInputMethodListLocked().contains(

                            methodMap.get(imeId))) {

                        settings.appendAndPutEnabledInputMethodLocked(imeId, false);

                        settings.appendAndPutEnabledInputMethodLocked(imeId);

                    }

                } else {

                    settings.buildAndPutEnabledInputMethodsStrRemovingIdLocked(
@@ -6336,7 +6336,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                        }

                    }

                    if (!previouslyEnabled) {

                        settings.appendAndPutEnabledInputMethodLocked(imeId, false);

                        settings.appendAndPutEnabledInputMethodLocked(imeId);

                    }

                }

            } else {
@@ -6480,7 +6480,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                        settings.putEnabledInputMethodsStr("");

                        nextEnabledImes.forEach(

                                imi -> settings.appendAndPutEnabledInputMethodLocked(

                                        imi.getId(), false));

                                        imi.getId()));



                        // Reset selected IME.

                        settings.putSelectedInputMethod(nextIme);

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

+1 −4
Original line number Diff line number Diff line
@@ -362,10 +362,7 @@ final class InputMethodUtils { 
            return result;

        }



        void appendAndPutEnabledInputMethodLocked(String id, boolean reloadInputMethodStr) {

            if (reloadInputMethodStr) {

                getEnabledInputMethodsStr();

            }

        void appendAndPutEnabledInputMethodLocked(String id) {

            if (TextUtils.isEmpty(mEnabledInputMethodsStrCache)) {

                // Add in the newly enabled input method.

                putEnabledInputMethodsStr(id);