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

Commit bc60116c authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Fix broken language matching logic in TSMS 

Checking language similarity with String#startsWith() is fundamentally
broken.  For instance, "fi" (Finnish) can match "fil" (Filipino).

This CL addresses such a broken comparison.

Bug: 110275412
Test: Manually verified that spell checker still works
Change-Id: I8d71760c534627b7707e16eb0fc648989f7692ae
parent bb0a2247

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

+7 −14
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.function.Predicate;



public class TextServicesManagerService extends ITextServicesManager.Stub {
@@ -536,26 +537,18 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
                && !allowImplicitlySelectedSubtype) {

            return null;

        }

        String candidateLocale = null;

        if (subtypeHashCode == 0) {

            // Spell checker language settings == "auto"

            // Use System locale if available in the spell checker

            candidateLocale = systemLocale.toString();

        }

        SpellCheckerSubtype candidate = null;

        for (int i = 0; i < sci.getSubtypeCount(); ++i) {

            final SpellCheckerSubtype scs = sci.getSubtypeAt(i);

            if (subtypeHashCode == 0) {

                final String scsLocale = scs.getLocale();

                if (candidateLocale.equals(scsLocale)) {

                final Locale scsLocale = scs.getLocaleObject();

                if (Objects.equals(scsLocale, systemLocale)) {

                    return scs;

                } else if (candidate == null) {

                    if (candidateLocale.length() >= 2 && scsLocale.length() >= 2

                            && candidateLocale.startsWith(scsLocale)) {

                } else if (candidate == null && systemLocale != null && scsLocale != null

                        && TextUtils.equals(systemLocale.getLanguage(), scsLocale.getLanguage())) {

                    // Fall back to the applicable language

                    candidate = scs;

                }

                }

            } else if (scs.hashCode() == subtypeHashCode) {

                if (DBG) {

                    Slog.w(TAG, "Return subtype " + scs.hashCode() + ", " + scs.getLocale());