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

Commit b119a085 authored by Guliz Tuncay's avatar Guliz Tuncay Committed by Yohei Yukawa
Browse files

Select only preinstalled Spell Checker Services 

When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Bug: 64764051
Fixes: 67410643
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0  -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
(manual cherrypick of 0f0a37ba)
parent 440240db

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

+17 −9
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        buildSpellCheckerMapLocked(mContext, mSpellCheckerList, mSpellCheckerMap, mSettings);

        SpellCheckerInfo sci = getCurrentSpellChecker(null);

        if (sci == null) {

            sci = findAvailSpellCheckerLocked(null);

            sci = findAvailSystemSpellCheckerLocked(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
@@ -230,7 +230,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
                        change == PACKAGE_PERMANENT_CHANGE || change == PACKAGE_TEMPORARY_CHANGE

                        // Package modified

                        || isPackageModified(packageName)) {

                    SpellCheckerInfo availSci = findAvailSpellCheckerLocked(packageName);

                    SpellCheckerInfo availSci = findAvailSystemSpellCheckerLocked(packageName);

                    // Set the spell checker settings if different than before

                    if (availSci != null && !availSci.getId().equals(sci.getId())) {

                        setCurrentSpellCheckerLocked(availSci);
@@ -375,18 +375,26 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        mSpellCheckerBindGroups.clear();

    }



    private SpellCheckerInfo findAvailSpellCheckerLocked(String prefPackage) {

        final int spellCheckersCount = mSpellCheckerList.size();

    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();

        if (spellCheckersCount == 0) {

            Slog.w(TAG, "no available spell checker services found");

            return null;

        }

        if (prefPackage != null) {

            for (int i = 0; i < spellCheckersCount; ++i) {

                final SpellCheckerInfo sci = mSpellCheckerList.get(i);

                final SpellCheckerInfo sci = spellCheckerList.get(i);

                if (prefPackage.equals(sci.getPackageName())) {

                    if (DBG) {

                        Slog.d(TAG, "findAvailSpellCheckerLocked: " + sci.getPackageName());

                        Slog.d(TAG, "findAvailSystemSpellCheckerLocked: " + sci.getPackageName());

                    }

                    return sci;

                }
@@ -400,7 +408,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        final ArrayList<Locale> suitableLocales =

                InputMethodUtils.getSuitableLocalesForSpellChecker(systemLocal);

        if (DBG) {

            Slog.w(TAG, "findAvailSpellCheckerLocked suitableLocales="

            Slog.w(TAG, "findAvailSystemSpellCheckerLocked suitableLocales="

                    + Arrays.toString(suitableLocales.toArray(new Locale[suitableLocales.size()])));

        }

        final int localeCount = suitableLocales.size();
@@ -408,7 +416,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
            final Locale locale = suitableLocales.get(localeIndex);

            for (int spellCheckersIndex = 0; spellCheckersIndex < spellCheckersCount;

                    ++spellCheckersIndex) {

                final SpellCheckerInfo info = mSpellCheckerList.get(spellCheckersIndex);

                final SpellCheckerInfo info = spellCheckerList.get(spellCheckersIndex);

                final int subtypeCount = info.getSubtypeCount();

                for (int subtypeIndex = 0; subtypeIndex < subtypeCount; ++subtypeIndex) {

                    final SpellCheckerSubtype subtype = info.getSubtypeAt(subtypeIndex);
@@ -427,7 +435,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        if (spellCheckersCount > 1) {

            Slog.w(TAG, "more than one spell checker service found, picking first");

        }

        return mSpellCheckerList.get(0);

        return spellCheckerList.get(0);

    }



    // TODO: Save SpellCheckerService by supported languages. Currently only one spell