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

Commit 9e5c77c1 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "IMMS should preserve enabled/selected IMEs upon boot" 

am: 171c82ac

Change-Id: I13b12269eb1cd29bb28bd6a1dadac59a2d539380
parents 93134fea 171c82ac

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1447,7 +1447,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED);

                broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED);

                mContext.registerReceiver(new ImmsBroadcastReceiver(), broadcastFilter);

                mContext.registerReceiver(new ImmsBroadcastReceiver(), broadcastFilter);





                buildInputMethodListLocked(true /* resetDefaultEnabledIme */);

                final String defaultImiId = mSettings.getSelectedInputMethod();

                final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId);

                buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);

                resetDefaultImeLocked(mContext);

                resetDefaultImeLocked(mContext);

                updateFromSettingsLocked(true);

                updateFromSettingsLocked(true);

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,