Update Android from 2020a to 2020b am: 633367f239
Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1454900
Change-Id: I53005ac564ea2eb9a60ca4d4d8e1bfb10cb01237
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 591ec68..84504a4 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -25,7 +25,7 @@
# a time zone for an Android device.
# ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2020a"
+ianaVersion:"2020b"
# countries:
#
@@ -224,7 +224,7 @@
>
timeZoneMappings:<
- utcOffset:"08:00"
+ utcOffset:"11:00"
id:"Antarctica/Casey"
>
@@ -420,7 +420,7 @@
>
timeZoneMappings:<
- utcOffset:"11:00"
+ utcOffset:"10:00"
id:"Antarctica/Macquarie"
# Unknown
priority:1
diff --git a/input_data/iana/tzdata2020a.tar.gz b/input_data/iana/tzdata2020a.tar.gz
deleted file mode 100644
index 15b39fb..0000000
--- a/input_data/iana/tzdata2020a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020a.tar.gz.asc b/input_data/iana/tzdata2020a.tar.gz.asc
deleted file mode 100644
index 222ad46..0000000
--- a/input_data/iana/tzdata2020a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9MACgkQ7ZfpDmKq
-fjTb6g/+P/l6Nev5Zv8mUktnT6eNKohtgpNRyHd8nYV92wmTiDSzAArFy7oi5CVV
-/jMv8sbV1ssq/5rQ6HUQuMDPgEIO405gxmqRWMhE6UwUbRxxa+/HKGUJH0AHY6Dh
-1UhVD7QA6fDovs84ip/WgTEZYcYApLr2A3IfC0rDqDo42DiSnErFQDvqRMJQkQS1
-p2Pv7YtW/2NZ52wkfq75klSsjlXzlz6CzM5P3/YU/Hylj42sQdbdtbUAyQug3YpD
-QQ2PiZoP92iiGrcwkKXa5xvXJ6jEZCXqi7HbJKt8OW+XpZ/ZYbTZRq+JvMbTqkOL
-+XvVufo/pVASgv2V0ynzJu/XRiFUeJaecmEg6QiAiJ74UMTXSGFnK//R32M9dp29
-B4p2X2jmW9qjCwjbjQXl1Yl5ddlSyvBk2Lk4s1repQ2t7kphZx2C8P2WyQYGeP7H
-nZDucfmWK4OSh8cINexBE8xyagmv1T8mC4qEQbVPva6JysaodNBcf9WkKMCgituP
-tbPsVekSmG1GyN2ixPtpY86Fzjr60mEg1UKqHZIagRmH4kjUwd1gINCJgONaZZxo
-c1VfBD8ZORBZfG27+V5ISotKrK2UrKtcrSUEU1CC/ibOm1sSPfg0d5uxUVvg4E8+
-okdszbMnQ1i0eVKW+L+jY5XOO8kmSLp4YcnrqXDyZabxyWIGMt4=
-=7U2J
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2020b.tar.gz b/input_data/iana/tzdata2020b.tar.gz
new file mode 100644
index 0000000..874e97e
--- /dev/null
+++ b/input_data/iana/tzdata2020b.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2020b.tar.gz.asc b/input_data/iana/tzdata2020b.tar.gz.asc
new file mode 100644
index 0000000..062a7a1
--- /dev/null
+++ b/input_data/iana/tzdata2020b.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl99HToACgkQ7ZfpDmKq
+fjT5CQ//W6kd+vP2tAdMbmJnH35sCd0NoAFBC1j00Blg+I6s507w5VjOTjvrvjlE
+0RB2G67vNKTOBybPyk7l8cKq+5Xw5IE1xqwqfpN3+DH2BWt4P0AllcBBRRky9iXS
+oO+z4F51rud9+CD2vbhtx0eT9MWYVfzrncNUHIYm7sDx01vtCp3h5u9ryB2sfHT/
+iMKrB5ytFqWkNXZtMiRDj3LZF0y2+JM1/8lfZB/hyxx1Bbvcm07dQvBBz8ljT6KD
+/BJFsgwvvlpxOZ1P0fFb7BnMPD5v/fB5r/0i/c4ErIY8JPtxDY6ctGdtbC/0H7Xf
+kjve+Fue08CBg4tXEW75SvWBP8Li1XylSNohIEtnclXj9B1nwu0WArZtATIqhpxl
+T77J85JkVQoAi5Wh38Msy9QWb54FRoK8/c1drfwb/iMkRYt57mU5zuY9JJvx7mAm
+S3eVqU3/tX4Ue7gQ1hjW3m9abmS1Hmq4aQ8r1uS0t2cIjbrMY2zaRwYzb2UknT2w
+VVr5O5bWoPHSFDeqUU7NdGHQzJX+NLvpTlcvJHXONSu7CksC09uhzBVJ2LbkjQS1
+zD+jSCTgXZonegcF0/UsfMrxmrizDFVcvwDXnDa4TcRPVSevtdWvM+EXr3Dto0N/
+wlI4v2nZE2ZFB3+7iGxc0WwiHUdsVbQVD+fCTIBl4Uh4ViTAsXI=
+=/O2G
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index c97b964..6bf54bc 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -1,5 +1,5 @@
# Autogenerated file - DO NOT EDIT.
-ianaVersion: "2020a"
+ianaVersion: "2020b"
countryMappings {
isoCode: "ad"
timeZoneIds: "Europe/Andorra"
@@ -148,7 +148,6 @@
isoCode: "au"
timeZoneIds: "Australia/Sydney"
timeZoneIds: "Australia/Brisbane"
- timeZoneIds: "Antarctica/Macquarie"
timeZoneIds: "Australia/Lord_Howe"
timeZoneIds: "Australia/Adelaide"
timeZoneIds: "Australia/Darwin"
@@ -219,6 +218,11 @@
fromMillis: 762883200000
}
timeZoneReplacements {
+ replacedId: "Antarctica/Macquarie"
+ replacementId: "Australia/Sydney"
+ fromMillis: 1286035200000
+ }
+ timeZoneReplacements {
replacedId: "Australia/Broken_Hill"
replacementId: "Australia/Adelaide"
fromMillis: 796149000000
@@ -522,7 +526,7 @@
timeZoneReplacements {
replacedId: "America/Dawson_Creek"
replacementId: "America/Edmonton"
- fromMillis: 1583661600000
+ fromMillis: 1604214000000
}
timeZoneReplacements {
replacedId: "America/Creston"
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index c703fad..692f4ae 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2020a">
+--><timezones ianaversion="2020b">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -67,7 +67,7 @@
<id notafter="37728000000" repl="Australia/Sydney">Australia/Currie</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
<id alts="Australia/LHI">Australia/Lord_Howe</id>
<id alts="Australia/South">Australia/Adelaide</id>
<id notafter="796149000000" repl="Australia/Adelaide" alts="Australia/Yancowinna">Australia/Broken_Hill</id>
@@ -181,7 +181,7 @@
<id notafter="986112000000" repl="America/Winnipeg">America/Rainy_River</id>
<id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
<id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
- <id notafter="1583661600000" repl="America/Edmonton">America/Dawson_Creek</id>
+ <id notafter="1604214000000" repl="America/Edmonton">America/Dawson_Creek</id>
<id notafter="84013200000" repl="America/Edmonton">America/Creston</id>
<id notafter="1425808800000" repl="America/Edmonton">America/Fort_Nelson</id>
<id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index c12abf1..6e42ef7 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index 422f03a..f08db77 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index 89facfe..f765a0c 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 4240de7..9e8114d 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-005.001|2020a|001
\ No newline at end of file
+005.001|2020b|001
\ No newline at end of file
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index 8906877..e70c285 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="37728000000" repl="Australia/Sydney">Australia/Currie</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
<id alts="Australia/LHI">Australia/Lord_Howe</id>
<id alts="Australia/South">Australia/Adelaide</id>
<id notafter="796149000000" repl="Australia/Adelaide" alts="Australia/Yancowinna">Australia/Broken_Hill</id>
@@ -181,7 +181,7 @@
<id notafter="986112000000" repl="America/Winnipeg">America/Rainy_River</id>
<id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
<id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
- <id notafter="1583661600000" repl="America/Edmonton">America/Dawson_Creek</id>
+ <id notafter="1604214000000" repl="America/Edmonton">America/Dawson_Creek</id>
<id notafter="84013200000" repl="America/Edmonton">America/Creston</id>
<id notafter="1425808800000" repl="America/Edmonton">America/Fort_Nelson</id>
<id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 2e5603d..34c0957 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/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index e60fb5e..a8c321f 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
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 8ed9429..367c28a 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 681f304..5f453a8 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="37728000000" repl="Australia/Sydney">Australia/Currie</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
<id alts="Australia/LHI">Australia/Lord_Howe</id>
<id alts="Australia/South">Australia/Adelaide</id>
<id notafter="796149000000" repl="Australia/Adelaide" alts="Australia/Yancowinna">Australia/Broken_Hill</id>
@@ -181,7 +181,7 @@
<id notafter="986112000000" repl="America/Winnipeg">America/Rainy_River</id>
<id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
<id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
- <id notafter="1583661600000" repl="America/Edmonton">America/Dawson_Creek</id>
+ <id notafter="1604214000000" repl="America/Edmonton">America/Dawson_Creek</id>
<id notafter="84013200000" repl="America/Edmonton">America/Creston</id>
<id notafter="1425808800000" repl="America/Edmonton">America/Fort_Nelson</id>
<id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 3728847..e2c3c04 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/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index e2b8fac..2b31638 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
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 533792d..54822e7 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 8906877..e70c285 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
<id notafter="37728000000" repl="Australia/Sydney">Australia/Currie</id>
<id alts="Australia/Queensland">Australia/Brisbane</id>
<id notafter="762883200000" repl="Australia/Brisbane">Australia/Lindeman</id>
- <id>Antarctica/Macquarie</id>
+ <id notafter="1286035200000" repl="Australia/Sydney">Antarctica/Macquarie</id>
<id alts="Australia/LHI">Australia/Lord_Howe</id>
<id alts="Australia/South">Australia/Adelaide</id>
<id notafter="796149000000" repl="Australia/Adelaide" alts="Australia/Yancowinna">Australia/Broken_Hill</id>
@@ -181,7 +181,7 @@
<id notafter="986112000000" repl="America/Winnipeg">America/Rainy_River</id>
<id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
<id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
- <id notafter="1583661600000" repl="America/Edmonton">America/Dawson_Creek</id>
+ <id notafter="1604214000000" repl="America/Edmonton">America/Dawson_Creek</id>
<id notafter="84013200000" repl="America/Edmonton">America/Creston</id>
<id notafter="1425808800000" repl="America/Edmonton">America/Fort_Nelson</id>
<id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index 3c1e3a2..577f20e 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/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index e60fb5e..a8c321f 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
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 4506871..063cb1e 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