Merge "Update Mongolia in countryzones.txt due to ICU 67 version upgrade" am: 0c5cbdcbb0 am: c6fd685ad0
Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1540174
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a7444ebfda142f2fd6b49f11ad2fba06e0d2416
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 1ceaad6..0ceda0c 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -2100,21 +2100,32 @@
>
# MONGOLIA
+#
+# Priorities assigned on 20210105 using:
+# https://en.wikipedia.org/wiki/List_of_cities_in_Mongolia
+# ... etc.
+# Priority is related to the population of the province.
countries:<
isoCode:"mn"
defaultTimeZoneId:"Asia/Ulaanbaatar"
timeZoneMappings:<
utcOffset:"8:00"
id:"Asia/Choibalsan"
+ # 38K
+ priority:38
>
timeZoneMappings:<
utcOffset:"8:00"
id:"Asia/Ulaanbaatar"
+ # 1.145M
+ priority:1145
>
timeZoneMappings:<
utcOffset:"7:00"
id:"Asia/Hovd"
+ # 29K
+ priority:29
>
>
diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index 9ca4854..ba01621 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -48,7 +48,6 @@
countryMappings {
isoCode: "ar"
timeZoneIds: "America/Argentina/Buenos_Aires"
- timeZoneIds: "America/Argentina/San_Luis"
timeZoneLinks {
alternativeId: "America/Buenos_Aires"
preferredId: "America/Argentina/Buenos_Aires"
@@ -127,6 +126,11 @@
replacementId: "America/Argentina/Salta"
fromMillis: 1087704000000
}
+ timeZoneReplacements {
+ replacedId: "America/Argentina/San_Luis"
+ replacementId: "America/Argentina/Buenos_Aires"
+ fromMillis: 1255233600000
+ }
}
countryMappings {
isoCode: "as"
@@ -1066,7 +1070,7 @@
timeZoneReplacements {
replacedId: "Asia/Aqtobe"
replacementId: "Asia/Oral"
- fromMillis: 1545328800000
+ fromMillis: 1099173600000
}
timeZoneReplacements {
replacedId: "Asia/Atyrau"
@@ -1181,13 +1185,17 @@
}
countryMappings {
isoCode: "mn"
- timeZoneIds: "Asia/Choibalsan"
timeZoneIds: "Asia/Ulaanbaatar"
timeZoneIds: "Asia/Hovd"
timeZoneLinks {
alternativeId: "Asia/Ulan_Bator"
preferredId: "Asia/Ulaanbaatar"
}
+ timeZoneReplacements {
+ replacedId: "Asia/Choibalsan"
+ replacementId: "Asia/Ulaanbaatar"
+ fromMillis: 1206889200000
+ }
}
countryMappings {
isoCode: "mo"
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index f76732b..99980b0 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -52,7 +52,7 @@
<id notafter="687931200000" repl="America/Argentina/Catamarca">America/Argentina/La_Rioja</id>
<id notafter="673588800000" repl="America/Argentina/La_Rioja">America/Argentina/Rio_Gallegos</id>
<id notafter="1087704000000" repl="America/Argentina/Salta">America/Argentina/Ushuaia</id>
- <id>America/Argentina/San_Luis</id>
+ <id notafter="1255233600000" repl="America/Argentina/Buenos_Aires">America/Argentina/San_Luis</id>
</country>
<country code="as" default="Pacific/Pago_Pago" everutc="n">
<id alts="Pacific/Samoa,US/Samoa">Pacific/Pago_Pago</id>
@@ -468,7 +468,7 @@
<id>Asia/Oral</id>
<id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
<id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
- <id notafter="1545328800000" repl="Asia/Oral">Asia/Aqtobe</id>
+ <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
<id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -536,7 +536,7 @@
<id alts="Asia/Rangoon">Asia/Yangon</id>
</country>
<country code="mn" default="Asia/Ulaanbaatar" everutc="n">
- <id>Asia/Choibalsan</id>
+ <id notafter="1206889200000" repl="Asia/Ulaanbaatar">Asia/Choibalsan</id>
<id alts="Asia/Ulan_Bator">Asia/Ulaanbaatar</id>
<id>Asia/Hovd</id>
</country>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 8704f22..5290987 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index eb590a4..d158ef8 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index be7170c..03a9869 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -52,7 +52,7 @@
<id notafter="687931200000" repl="America/Argentina/Catamarca">America/Argentina/La_Rioja</id>
<id notafter="673588800000" repl="America/Argentina/La_Rioja">America/Argentina/Rio_Gallegos</id>
<id notafter="1087704000000" repl="America/Argentina/Salta">America/Argentina/Ushuaia</id>
- <id>America/Argentina/San_Luis</id>
+ <id notafter="1255233600000" repl="America/Argentina/Buenos_Aires">America/Argentina/San_Luis</id>
</country>
<country code="as" default="Pacific/Pago_Pago" everutc="n">
<id alts="Pacific/Samoa,US/Samoa">Pacific/Pago_Pago</id>
@@ -468,7 +468,7 @@
<id>Asia/Oral</id>
<id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
<id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
- <id notafter="1545328800000" repl="Asia/Oral">Asia/Aqtobe</id>
+ <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
<id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -536,7 +536,7 @@
<id alts="Asia/Rangoon">Asia/Yangon</id>
</country>
<country code="mn" default="Asia/Ulaanbaatar" everutc="n">
- <id>Asia/Choibalsan</id>
+ <id notafter="1206889200000" repl="Asia/Ulaanbaatar">Asia/Choibalsan</id>
<id alts="Asia/Ulan_Bator">Asia/Ulaanbaatar</id>
<id>Asia/Hovd</id>
</country>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index ab251b3..d9d6277 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index 7eaa126..88ed6ac 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 04af3f9..c7f162b 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -52,7 +52,7 @@
<id notafter="687931200000" repl="America/Argentina/Catamarca">America/Argentina/La_Rioja</id>
<id notafter="673588800000" repl="America/Argentina/La_Rioja">America/Argentina/Rio_Gallegos</id>
<id notafter="1087704000000" repl="America/Argentina/Salta">America/Argentina/Ushuaia</id>
- <id>America/Argentina/San_Luis</id>
+ <id notafter="1255233600000" repl="America/Argentina/Buenos_Aires">America/Argentina/San_Luis</id>
</country>
<country code="as" default="Pacific/Pago_Pago" everutc="n">
<id alts="Pacific/Samoa,US/Samoa">Pacific/Pago_Pago</id>
@@ -468,7 +468,7 @@
<id>Asia/Oral</id>
<id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
<id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
- <id notafter="1545328800000" repl="Asia/Oral">Asia/Aqtobe</id>
+ <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
<id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -536,7 +536,7 @@
<id alts="Asia/Rangoon">Asia/Yangon</id>
</country>
<country code="mn" default="Asia/Ulaanbaatar" everutc="n">
- <id>Asia/Choibalsan</id>
+ <id notafter="1206889200000" repl="Asia/Ulaanbaatar">Asia/Choibalsan</id>
<id alts="Asia/Ulan_Bator">Asia/Ulaanbaatar</id>
<id>Asia/Hovd</id>
</country>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 8ac6e76..14dd071 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index 92c4571..0d62433 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index be7170c..03a9869 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -52,7 +52,7 @@
<id notafter="687931200000" repl="America/Argentina/Catamarca">America/Argentina/La_Rioja</id>
<id notafter="673588800000" repl="America/Argentina/La_Rioja">America/Argentina/Rio_Gallegos</id>
<id notafter="1087704000000" repl="America/Argentina/Salta">America/Argentina/Ushuaia</id>
- <id>America/Argentina/San_Luis</id>
+ <id notafter="1255233600000" repl="America/Argentina/Buenos_Aires">America/Argentina/San_Luis</id>
</country>
<country code="as" default="Pacific/Pago_Pago" everutc="n">
<id alts="Pacific/Samoa,US/Samoa">Pacific/Pago_Pago</id>
@@ -468,7 +468,7 @@
<id>Asia/Oral</id>
<id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
<id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
- <id notafter="1545328800000" repl="Asia/Oral">Asia/Aqtobe</id>
+ <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
<id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -536,7 +536,7 @@
<id alts="Asia/Rangoon">Asia/Yangon</id>
</country>
<country code="mn" default="Asia/Ulaanbaatar" everutc="n">
- <id>Asia/Choibalsan</id>
+ <id notafter="1206889200000" repl="Asia/Ulaanbaatar">Asia/Choibalsan</id>
<id alts="Asia/Ulan_Bator">Asia/Ulaanbaatar</id>
<id>Asia/Hovd</id>
</country>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index dad5a49..5eec145 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
index a72a8c9..5a80e01 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
Binary files differ