diff options
| author | Neil Fuller <nfuller@google.com> | 2016-11-04 10:44:41 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-11-04 18:50:46 +0000 |
| commit | c96e9fcad083e7c7d815a7f76526b42a2fbe0e55 (patch) | |
| tree | ca7c8bd81a8bb6867d7ebf87abbe170a9139ba13 /android_icu4j | |
| parent | f756719945619a3f3426bccfa90d61f606f5736e (diff) | |
| download | icu-c96e9fcad083e7c7d815a7f76526b42a2fbe0e55.tar.gz | |
Snap ICU timezone-related .txt files to latest
This commit pulls in recent ICU changes to timezone
related files. This is before applying the upcoming 2016i
update so we will not carry spurious diffs.
Upstream ICU have changed their file headers and updated
windowsZones.txt with updates to Europe/Simferopol specifically,
and for CLDR 30 generally.
See: http://unicode.org/cldr/trac/ticket/9816 for information
on the Simferopol change. This change to Android is a technical
change to reduce differences, not a political stance.
These files correspond to:
data/trunk/tzdata/supplemental/metaZones.txt r39391
data/trunk/tzdata/supplemental/timezoneTypes.txt r39391
data/trunk/tzdata/supplemental/windowsZones.txt r39460
This commit also relaxes an ICU test that
fails when the windowsZones.txt change is taken. This allows devices
that have taken the windowsZones.txt change as well as those that
have not to pass the tests. The behavior is effectively left "undefined"
by this change.
The ability to map this specific IANA timezone ID to a
Windows ID is unlikely to affect actual app compatibility. The
windowsZones.txt change will affect the behavior of some
android.icu.util.TimeZone methods related to Windows IDs.
Bug: 32655082
Bug: 32512035
Bug: 32534123
Test: CtsLibcoreTestCases / CtsIcuTestCases
Change-Id: Icb8371cabb72c2f09237d93a3767a9c894cd8859
Diffstat (limited to 'android_icu4j')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java index 74d951415..9567919be 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java @@ -2257,7 +2257,9 @@ public class TimeZoneTest extends TestFmwk {"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name {"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name {"Asia/Khandyga", "Yakutsk Standard Time"}, - {"Australia/Eucla", null}, // No Windows ID mapping + // Android-changed: Removed this case because CLDR 30 now has a mapping and some OEMs + // have picked up the windowsZone.txt change. http://b/32534123 & http://b/32512035. + // {"Australia/Eucla", null}, // No Windows ID mapping {"Bogus", null}, }; |