diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-01-10 00:44:41 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-01-10 00:44:41 +0000 |
commit | 1684713f2e99cca2d425bdbfe2e76be4ba0999c4 (patch) | |
tree | 4e481b2e2212a5622704a9a9890344bbf86af752 | |
parent | b2b98a008bc69d22a283475c35319cd382383798 (diff) | |
parent | 7abf49d3b72dabae184bcfd79eb6ad009814c551 (diff) | |
download | base-1684713f2e99cca2d425bdbfe2e76be4ba0999c4.tar.gz |
[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7
Change-Id: I019b36991306a8f7887b7a0b8233b2c9f1c9ed32
-rw-r--r-- | services/core/java/com/android/server/TextServicesManagerService.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java index 3273e7ef52f3..4f02a23d1e76 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -183,7 +183,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { buildSpellCheckerMapLocked(mContext, mSpellCheckerList, mSpellCheckerMap, mSettings); SpellCheckerInfo sci = getCurrentSpellChecker(null); if (sci == null) { - sci = findAvailSystemSpellCheckerLocked(null); + sci = findAvailSpellCheckerLocked(null); if (sci != null) { // Set the current spell checker if there is one or more spell checkers // available. In this case, "sci" is the first one in the available spell @@ -227,7 +227,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { change == PACKAGE_PERMANENT_CHANGE || change == PACKAGE_TEMPORARY_CHANGE // Package modified || isPackageModified(packageName)) { - sci = findAvailSystemSpellCheckerLocked(packageName); + sci = findAvailSpellCheckerLocked(packageName); if (sci != null) { setCurrentSpellCheckerLocked(sci.getId()); } @@ -371,16 +371,8 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { mSpellCheckerBindGroups.clear(); } - private SpellCheckerInfo findAvailSystemSpellCheckerLocked(String prefPackage) { - // Filter the spell checker list to remove spell checker services that are not pre-installed - ArrayList<SpellCheckerInfo> spellCheckerList = new ArrayList<>(); - for (SpellCheckerInfo sci : mSpellCheckerList) { - if ((sci.getServiceInfo().applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { - spellCheckerList.add(sci); - } - } - - final int spellCheckersCount = spellCheckerList.size(); + private SpellCheckerInfo findAvailSpellCheckerLocked(String prefPackage) { + final int spellCheckersCount = mSpellCheckerList.size(); if (spellCheckersCount == 0) { Slog.w(TAG, "no available spell checker services found"); return null; @@ -390,7 +382,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { final SpellCheckerInfo sci = mSpellCheckerList.get(i); if (prefPackage.equals(sci.getPackageName())) { if (DBG) { - Slog.d(TAG, "findAvailSystemSpellCheckerLocked: " + sci.getPackageName()); + Slog.d(TAG, "findAvailSpellCheckerLocked: " + sci.getPackageName()); } return sci; } @@ -404,7 +396,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { final ArrayList<Locale> suitableLocales = InputMethodUtils.getSuitableLocalesForSpellChecker(systemLocal); if (DBG) { - Slog.w(TAG, "findAvailSystemSpellCheckerLocked suitableLocales=" + Slog.w(TAG, "findAvailSpellCheckerLocked suitableLocales=" + Arrays.toString(suitableLocales.toArray(new Locale[suitableLocales.size()]))); } final int localeCount = suitableLocales.size(); |