Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 171c82acb4

Change-Id: I13b12269eb1cd29bb28bd6a1dadac59a2d539380
This commit is contained in:
Yohei Yukawa
2017-10-27 01:10:36 +00:00
committed by android-build-merger
parent 93134fea64 171c82acb4
commit 9e5c77c194
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -1447,7 +1447,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED);
mContext.registerReceiver(new ImmsBroadcastReceiver(), broadcastFilter);
buildInputMethodListLocked(true /* resetDefaultEnabledIme */);
final String defaultImiId = mSettings.getSelectedInputMethod();
final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId);
buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);
resetDefaultImeLocked(mContext);
updateFromSettingsLocked(true);
InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,