| commit | 44ebb70e4303e72de28fd3ad9200777f0b6212a4 | [log] [tgz] |
|---|---|---|
| author | Pete Gillin <peteg@google.com> | Tue Jan 15 14:18:04 2019 +0000 |
| committer | Pete Gillin <peteg@google.com> | Thu Jan 31 17:54:00 2019 +0000 |
| tree | a99e707b80a54695d2b37048764d16e79dd294ad | |
| parent | 506ecc27598840e23aedd12598bb3731e045c00f [diff] |
DO NOT MERGE: Fix Morocco to use rearguard format correctly in ICU. The previous change had no DST for these zones and changed the raw GMT offset twice a year instead, which is problematic for the reasons given in the comment in icu4c/source/tools/tzcode/icuzones in the other change in this topic. This change fixes test.java.time.format.TestZoneTextPrinterParser, which was broken by the previous change (http://r.android.com/871773). (cherry picked from commit 43bb2ab7d1099b7cc97033d3840866fda1197b75) Bug: 123184555 Test: CtsLibcoreTestsCases Test: CtsLibcoreOjTestCases (but see above) Test: CtsIcuTestCases Test: CtsBionicTestCases (cherry picked from commit e410717d7c6f84851cb327cadcb6dd630da98351) Change-Id: Iae1c16521e4fdb13b6d8a2e8ebf54ca09ddf1ede
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt index f5d8f39..ca74897 100644 --- a/input_data/android/countryzones.txt +++ b/input_data/android/countryzones.txt
@@ -1202,7 +1202,7 @@ countries:< isoCode:"eh" timeZoneMappings:< - utcOffset:"1:00" + utcOffset:"0:00" id:"Africa/El_Aaiun" > > @@ -1944,7 +1944,7 @@ countries:< isoCode:"ma" timeZoneMappings:< - utcOffset:"1:00" + utcOffset:"0:00" id:"Africa/Casablanca" > >
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip index 734a87d..485a6d4 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 c68f2cb..93f3bd9 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/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip index 64a4df0..b9c2221 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 e37d3cc..10ecdff 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/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip index a274bfa..248c99b 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 e1ca285..627a5a1 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