Merge "Fix broken language matching logic in TSMS" (e3f2e744) · Commits · e / os / android_frameworks_base

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 {
		@@ -535,26 +536,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());