diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:19:22 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:19:22 +0000 |
commit | 3de79609936bab7558693824dd7c033427e4cf91 (patch) | |
tree | e170c46911df1a93406b48020b75e559657568be | |
parent | dd917d3658c4b1a4b508e582e223eb25ba6a435b (diff) | |
parent | bd22116ecd7fedd067cfe49bcaf8366b8f76cec7 (diff) | |
download | timezone-simpleperf-release.tar.gz |
Snap for 11510257 from bd22116ecd7fedd067cfe49bcaf8366b8f76cec7 to simpleperf-releasesimpleperf-release
Change-Id: I62528172e956610876825aa2cb027979759e61d9
16 files changed, 77 insertions, 65 deletions
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt index 7750bfd1..486eb1c4 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:"2023d" +ianaVersion:"2024a" # countries: # @@ -1942,46 +1942,54 @@ countries:< # KAZAKHSTAN # -# Priorities assigned on 20190107 using: +# Priorities assigned on 13 Feb 2024 using: # https://en.wikipedia.org/wiki/List_of_cities_in_Kazakhstan -# Priority is just an abstract score. +# Priority is related to city population. countries:< isoCode:"kz" defaultTimeZoneId:"Asia/Almaty" timeZoneMappings:< - utcOffset:"6:00" + utcOffset:"5:00" id:"Asia/Almaty" - priority:2 + # Population is 2.217M (wiki, 2023) + priority:2217 > timeZoneMappings:< - utcOffset:"6:00" - id:"Asia/Qostanay" + utcOffset:"5:00" + id:"Asia/Aqtobe" + # Population is 560K (wiki 2023) + priority:560 > - timeZoneMappings:< utcOffset:"5:00" - id:"Asia/Oral" - priority:2 + id:"Asia/Qyzylorda" + # Population is 315500 (wiki, 2023) + # Rounding up to avoid conflicts with Asia/Atyrau. + priority:316 > timeZoneMappings:< utcOffset:"5:00" - id:"Asia/Aqtau" - priority:1 + id:"Asia/Atyrau" + # Population is 315274 (wiki, 2023) + priority:315 > timeZoneMappings:< utcOffset:"5:00" - id:"Asia/Qyzylorda" - priority:1 + id:"Asia/Aqtau" + # Population is 270K (wiki, 2023) + priority:270 > timeZoneMappings:< utcOffset:"5:00" - id:"Asia/Aqtobe" - priority:1 + id:"Asia/Qostanay" + # Population is 265K (wiki, 2023) + priority:265 > timeZoneMappings:< utcOffset:"5:00" - id:"Asia/Atyrau" - priority:1 + id:"Asia/Oral" + # Population is 254K (wiki, 2023) + priority:254 > > diff --git a/input_data/iana/tzdata2023d.tar.gz b/input_data/iana/tzdata2023d.tar.gz Binary files differdeleted file mode 100644 index 1d3df379..00000000 --- a/input_data/iana/tzdata2023d.tar.gz +++ /dev/null diff --git a/input_data/iana/tzdata2023d.tar.gz.asc b/input_data/iana/tzdata2023d.tar.gz.asc deleted file mode 100644 index 45ea5e17..00000000 --- a/input_data/iana/tzdata2023d.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmWFCxkACgkQ7ZfpDmKq -fjRuUxAAoioAZhZkP9DnoNvoo2YG+g4gxS4GIIw1KK6nhZqIN8F9e4wrvw6/++x/ -7FNP2+KV7ObTNlqeONv2niAL8zuFq8VhkN60D4j1qEu9H21Wxp6HFWOFEWi8l5TS -l6dp4S1Rb5LmCVlbj2MbrbE6Qc+QptSdGuw12MQR34b5F8pX39vt+edMfHvA2lw0 -KhMkELOaBhKCAoiVHC8onUZvCg5qEpynQ88LpKgnLWslT9fcU3m0mCuiXldSn5kp -KppIlAFp6WuaKIJiuj61gjH9Py00PM7ww1+0eZbnbametmM3E2Or+YoP1pm5bIy8 -77+iVCvBu+B1aW/cC1h2k3vLRUg8sFxMvGJdpow6JN1D+2e3Flk8+A8DPwRXtCRV -yjjGOzIltbWwD7fisPKbvXSrVlQmMrNLMoyQcljZbYUa5nhTMoCiv+yed/DzG2ZF -pwAJguKenamOiRpChFfkrVXBn/AWr4G7FVAogckFClz7qP6KSekJ0h1MzUw31c5g -8XZEwXNO2RGLbhgCw5uLg3V2KUvurSYGSBB46TnMNBLz1xRNelzkJ7XvJVIhxCEN -L1t32v4jbD4YtXHqNugVId9uY3x8ed8SPdFy+8C2OqKY0TiWOTiAH2rz3vcz2L6O -rsubE+4g/LUQI0fS9hTcabD9RcsP3k3/h2fZYLORM6frwuZA82U= -=ylD7 ------END PGP SIGNATURE----- diff --git a/input_data/iana/tzdata2024a.tar.gz b/input_data/iana/tzdata2024a.tar.gz Binary files differnew file mode 100644 index 00000000..febf30b0 --- /dev/null +++ b/input_data/iana/tzdata2024a.tar.gz diff --git a/input_data/iana/tzdata2024a.tar.gz.asc b/input_data/iana/tzdata2024a.tar.gz.asc new file mode 100644 index 00000000..a8d198fd --- /dev/null +++ b/input_data/iana/tzdata2024a.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmW716sACgkQ7ZfpDmKq +fjTkQQ/6AqS/VNV6+RbbyLbLuOzh4GvYDMq1xTxGnjj7nwr80ob/wwSVmX7Gf5xt +gVgagC75EJyskY6dfUPbSHwmOx8Dk2ttQtEprhhzk+1WpUSPZoy/RYMdWN+JzO3s +LekrzU86SAh7yP21qSovYRM5rW02Da5RmiLUmknzBpP2cuZsq3qSPYUEMjB3JO39 +OzBq0nyLbUR9nqew/f6fcPviyweqTkZdcDsr/+jNUGDI/kezGQ0u3ExlGc0EmGU0 +ISAFB7uSDWgoJlwH3ZBtI4lOxiVQRKXafFcdvmLka0hYDGOm6f2zvkhvLEHVN9xK +/V680qKy1vIOkyDRp664P9qZ0951+tpb9I47ip7SLqqBoyWhlfb/SJ2eFfb3k+kx +fPkCX89QsqkfSPXySJCO13YYEQXpI2VPdWi0JxDI+LD/VEHITiydrYT+afnn0iyZ +bM/TKnqaQ4bhAXdLBj3oUSwFQHEgPgeLOrTmWEdN9YmO5Cwbm1gZvOKZ4u2CYW6I +ZM+ZwCuNO1hqYRSoeIaN60fUOneXaOcAejlOS/bJr7hNKUtmAjsSS7S7YGeNgQld +LXRDRD3vou/qIHlIhmGpTUlOBl5NXVrP42w91nBYEwNyY4lbKLw22GS4FRF1cu9+ +wfMfJqY4wwDp/uDMXAfWIXU1AdMg7t1NephMIGg4mivKGYmQmvY= +=CvSR +-----END PGP SIGNATURE----- diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt index 868a151f..e5c54b6f 100644 --- a/output_data/android/tzids.prototxt +++ b/output_data/android/tzids.prototxt @@ -1,5 +1,5 @@ # Autogenerated file - DO NOT EDIT. -ianaVersion: "2023d" +ianaVersion: "2024a" countryMappings { isoCode: "ad" timeZoneIds: "Europe/Andorra" @@ -1050,30 +1050,34 @@ countryMappings { countryMappings { isoCode: "kz" timeZoneIds: "Asia/Almaty" - timeZoneIds: "Asia/Oral" timeZoneReplacements { - replacedId: "Asia/Qostanay" + replacedId: "Asia/Aqtobe" replacementId: "Asia/Almaty" - fromMillis: 1099170000000 - } - timeZoneReplacements { - replacedId: "Asia/Aqtau" - replacementId: "Asia/Oral" - fromMillis: 1099173600000 + fromMillis: 1709229600000 } timeZoneReplacements { replacedId: "Asia/Qyzylorda" - replacementId: "Asia/Oral" + replacementId: "Asia/Aqtobe" fromMillis: 1545328800000 } timeZoneReplacements { - replacedId: "Asia/Aqtobe" - replacementId: "Asia/Oral" + replacedId: "Asia/Atyrau" + replacementId: "Asia/Aqtobe" fromMillis: 1099173600000 } timeZoneReplacements { - replacedId: "Asia/Atyrau" - replacementId: "Asia/Oral" + replacedId: "Asia/Aqtau" + replacementId: "Asia/Aqtobe" + fromMillis: 1099173600000 + } + timeZoneReplacements { + replacedId: "Asia/Qostanay" + replacementId: "Asia/Almaty" + fromMillis: 1099170000000 + } + timeZoneReplacements { + replacedId: "Asia/Oral" + replacementId: "Asia/Atyrau" fromMillis: 922572000000 } } diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml index a3a11287..1a75f971 100644 --- a/output_data/android/tzlookup.xml +++ b/output_data/android/tzlookup.xml @@ -2,7 +2,7 @@ **** Autogenerated file - DO NOT EDIT **** ---><timezones ianaversion="2023d"> +--><timezones ianaversion="2024a"> <countryzones> <country code="ad" default="Europe/Andorra" everutc="n"> <id>Europe/Andorra</id> @@ -459,12 +459,12 @@ </country> <country code="kz" default="Asia/Almaty" everutc="n"> <id>Asia/Almaty</id> + <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id> + <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id> <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id> - <id>Asia/Oral</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id> - <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id> - <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id> + <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id> </country> <country code="la" default="Asia/Vientiane" everutc="n"> <id>Asia/Vientiane</id> diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata Binary files differindex f3279182..7f21189a 100644 --- a/output_data/iana/tzdata +++ b/output_data/iana/tzdata diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat Binary files differindex f025fa25..d456f2f4 100644 --- a/output_data/icu_overlay/icu_tzdata.dat +++ b/output_data/icu_overlay/icu_tzdata.dat diff --git a/output_data/version/tz_version b/output_data/version/tz_version index be32e263..b5d274ae 100644 --- a/output_data/version/tz_version +++ b/output_data/version/tz_version @@ -1 +1 @@ -007.001|2023d|001
\ No newline at end of file +007.001|2024a|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 c83113c0..8008972e 100644 --- a/testing/data/test1/output_data/android/tzlookup.xml +++ b/testing/data/test1/output_data/android/tzlookup.xml @@ -459,12 +459,12 @@ </country> <country code="kz" default="Asia/Almaty" everutc="n"> <id>Asia/Almaty</id> + <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id> + <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id> <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id> - <id>Asia/Oral</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id> - <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id> - <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id> + <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id> </country> <country code="la" default="Asia/Vientiane" everutc="n"> <id>Asia/Vientiane</id> diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata Binary files differindex c133133a..8da93d95 100644 --- a/testing/data/test1/output_data/iana/tzdata +++ b/testing/data/test1/output_data/iana/tzdata diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat Binary files differindex be09ef05..08dfe826 100644 --- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat +++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml index c83113c0..8008972e 100644 --- a/testing/data/test3/output_data/android/tzlookup.xml +++ b/testing/data/test3/output_data/android/tzlookup.xml @@ -459,12 +459,12 @@ </country> <country code="kz" default="Asia/Almaty" everutc="n"> <id>Asia/Almaty</id> + <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id> + <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id> + <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id> <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id> - <id>Asia/Oral</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id> - <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id> - <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id> - <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id> + <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id> </country> <country code="la" default="Asia/Vientiane" everutc="n"> <id>Asia/Vientiane</id> diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata Binary files differindex c133133a..8da93d95 100644 --- a/testing/data/test3/output_data/iana/tzdata +++ b/testing/data/test3/output_data/iana/tzdata diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat Binary files differindex 70a88225..943a8354 100644 --- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat +++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat |