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

Commit 081a9100 authored by Winni Chang's avatar Winni Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix Menu language is not correct for CEC639-2 for traditional zh Hant"... 

Merge "Fix Menu language is not correct for CEC639-2 for traditional zh Hant" into main am: 5f4b0f92

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3108898



Change-Id: Icfbbec005cfd50b9687379c85a3a2403e35e49a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 940dabaa 5f4b0f92

services/core/java/com/android/server/hdmi/HdmiControlService.java

+9 −1
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ public class HdmiControlService extends SystemService { 
    private static final String TAG = "HdmiControlService";

    private static final Locale HONG_KONG = new Locale("zh", "HK");

    private static final Locale MACAU = new Locale("zh", "MO");

    private static final String TAIWAN_HantLanguageTag = "zh-Hant-TW";

    private static final String HONG_KONG_HantLanguageTag = "zh-Hant-HK";

    private static final String HONG_KONG_YUE_HantLanguageTag = "yue-Hant-HK";

    private static final String MACAU_HantLanguageTag = "zh-Hant-MO";



    private static final Map<String, String> sTerminologyToBibliographicMap =

            createsTerminologyToBibliographicMap();
@@ -174,7 +178,11 @@ public class HdmiControlService extends SystemService { 
    }



    @VisibleForTesting static String localeToMenuLanguage(Locale locale) {

        if (locale.equals(Locale.TAIWAN) || locale.equals(HONG_KONG) || locale.equals(MACAU)) {

        if (locale.equals(Locale.TAIWAN) || locale.equals(HONG_KONG) || locale.equals(MACAU) ||

                locale.toLanguageTag().equals(TAIWAN_HantLanguageTag) ||

                locale.toLanguageTag().equals(HONG_KONG_HantLanguageTag) ||

                locale.toLanguageTag().equals(HONG_KONG_YUE_HantLanguageTag) ||

                locale.toLanguageTag().equals(MACAU_HantLanguageTag)) {

            // Android always returns "zho" for all Chinese variants.

            // Use "bibliographic" code defined in CEC639-2 for traditional

            // Chinese used in Taiwan/Hong Kong/Macau.