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

Commit fb3b187f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4 

Change-Id: I11efc66592aada0a9b54299b6d782e92e247f811
parents 363e47e6 170e24d4

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

+6 −14
Original line number Diff line number Diff line
@@ -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();