diff options
author | Bryan Ferris <bferris@google.com> | 2019-01-10 16:14:19 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-10 16:14:19 -0800 |
commit | d596c0e4ef0d3e9c30f847ebadff696089cf2d92 (patch) | |
tree | 13285af0458673a9413bfccca11665fb0c6f0dc3 | |
parent | 340620b4cb7d7d56301f28212b6c5f2c234a381f (diff) | |
parent | 576e4ac18424294da6dafb482ba121c0dafd5ed6 (diff) | |
download | base-d596c0e4ef0d3e9c30f847ebadff696089cf2d92.tar.gz |
[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba
am: 576e4ac184
Change-Id: I304213f41d8b6f499d022f453392234ae901b36c
-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 a09b62d43d5a..9068745c1ef3 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -184,7 +184,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 @@ -228,7 +228,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()); } @@ -372,16 +372,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; @@ -391,7 +383,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; } @@ -405,7 +397,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(); |