diff options
| author | 2024-06-26 06:44:58 +0000 | |
|---|---|---|
| committer | 2024-06-26 06:44:58 +0000 | |
| commit | 5f4b0f92c1aabcb11b8bd2b236f03814f6fd8c0c (patch) | |
| tree | 65203f678bc1918f6d7b070e67ccd718c9e08bbe | |
| parent | d660759c068bbbac7f15027b1a19484b4d3103b8 (diff) | |
| parent | b96d615a39192f0ddddf6729592e7b47418d4678 (diff) | |
Merge "Fix Menu language is not correct for CEC639-2 for traditional zh Hant" into main
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index c8c662387d16..d5f8eadcf805 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -143,6 +143,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(); @@ -173,7 +177,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. |