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

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

Clean up IMMS#handleShellCommandResetInputMethod() a bit 

There should be no observable behavior change.

Bug: 34886274
Test: 'adb shell ime reset' still works
Change-Id: I45e2b2521b6ac2890f604745f1f2977a5a162610
parent ab1ad60e

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

+4 −16
Original line number Diff line number Diff line
@@ -4841,23 +4841,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                    // Also reset the settings of the current IME

                    mSettings.putSelectedInputMethod(null);

                    // Disable all enabled IMEs.

                    {

                        final ArrayList<InputMethodInfo> enabledImes =

                                mSettings.getEnabledInputMethodListLocked();

                        final int N = enabledImes.size();

                        for (int i = 0; i < N; ++i) {

                            setInputMethodEnabledLocked(enabledImes.get(i).getId(), false);

                        }

                    }

                    mSettings.getEnabledInputMethodListLocked().forEach(

                            imi -> setInputMethodEnabledLocked(imi.getId(), false));

                    // Re-enable with default enabled IMEs.

                    {

                        final ArrayList<InputMethodInfo> defaultEnabledIme =

                                InputMethodUtils.getDefaultEnabledImes(mContext, mMethodList);

                        final int N = defaultEnabledIme.size();

                        for (int i = 0; i < N; ++i) {

                            setInputMethodEnabledLocked(defaultEnabledIme.get(i).getId(), true);

                        }

                    }

                    InputMethodUtils.getDefaultEnabledImes(mContext, mMethodList).forEach(

                            imi -> setInputMethodEnabledLocked(imi.getId(), true));

                    updateInputMethodsFromSettingsLocked(true /* enabledMayChange */);

                    InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,

                            mSettings.getEnabledInputMethodListLocked(),