summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victor Chang <vichang@google.com> 2025-03-19 02:46:16 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-19 02:46:16 -0700
commit4e0efee3efdc544ed0ccd00acdd67c618454a8db (patch)
treeb29c3a23d08df95dd28e0cc6cbd0d30f61f94d09
parent33a3095926eca3db866552b27c7d456927fa44a2 (diff)
parent24f92f9e9edbe6743d7e676f503f48b45cf773fe (diff)
Merge "Regenerate LocaleDataLookup with CLDR patches" into main am: 24f92f9e9e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3540981 Change-Id: I49364d69b4bc394765bac99006d4bcbe167b003c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/androidfw/LocaleDataLookup.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/androidfw/LocaleDataLookup.cpp b/libs/androidfw/LocaleDataLookup.cpp
index 9aacdcb9ca92..ed645826234d 100644
--- a/libs/androidfw/LocaleDataLookup.cpp
+++ b/libs/androidfw/LocaleDataLookup.cpp
@@ -5774,7 +5774,6 @@ const char* lookupLikelyScript(uint32_t packed_lang_region) {
case 0xD2120000u: // squ -> Latn
case 0x73724D45u: // sr-ME -> Latn
case 0x7372524Fu: // sr-RO -> Latn
- case 0x73725255u: // sr-RU -> Latn
case 0x73725452u: // sr-TR -> Latn
case 0x82320000u: // sra -> Latn
case 0x92320000u: // sre -> Latn
@@ -7265,7 +7264,6 @@ const char* lookupLikelyScript(uint32_t packed_lang_region) {
return SCRIPT_CODES[73u];
case 0x8ACD0000u: // nwc -> Newa
return SCRIPT_CODES[74u];
- case 0xB40C474Eu: // man-GN -> Nkoo
case 0xBA0D0000u: // nqo -> Nkoo
return SCRIPT_CODES[75u];
case 0xDCF90000u: // zhx -> Nshu