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

Commit 603a6bb9 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Revert "[Regional Preference] Fix subtitle overlap" 

This reverts commit 5c7c53d0.

Reason for revert: find a logic bug, and need to improve.

Change-Id: I4aa7e61fc8cf7c4ce8fe59266851ed7b6c5737b0
parent 5c7c53d0

core/java/com/android/internal/app/LocaleStore.java

+0 −12
Original line number Diff line number Diff line
@@ -563,18 +563,6 @@ public class LocaleStore { 
        String id = locale.toLanguageTag();

        LocaleInfo result;

        if (!sLocaleCache.containsKey(id)) {

            // Locale preferences can modify the language tag to current system languages, so we

            // need to check the input locale without extra u extension except numbering system.

            Locale filteredLocale = new Locale.Builder()

                    .setLocale(locale.stripExtensions())

                    .setUnicodeLocaleKeyword("nu", locale.getUnicodeLocaleType("nu"))

                    .build();

            if (sLocaleCache.containsKey(filteredLocale.toLanguageTag())) {

                result = new LocaleInfo(locale);

                // This locale is included in supported locales, so set translated be true here.

                result.mIsTranslated = true;

                return result;

            }

            result = new LocaleInfo(locale);

            sLocaleCache.put(id, result);

        } else {