diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-12 12:34:32 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-12 12:39:53 +0100 |
| commit | 78b660e21412ff36d3eed179ff400d8fa690267e (patch) | |
| tree | d3794c448d21fb4f1564ca1a9a0d4223b37d86ba /luni | |
| parent | 0a2ddb63dcf5fa82131bc026f12c731ad85b2053 (diff) | |
| download | libcore-78b660e21412ff36d3eed179ff400d8fa690267e.zip libcore-78b660e21412ff36d3eed179ff400d8fa690267e.tar.gz libcore-78b660e21412ff36d3eed179ff400d8fa690267e.tar.bz2 | |
Fix mapping for Field.TIME_ZONE.
This partially reverts 018b61546e.
Commit 018b61546e claims to fix a few failing tests, but the
tests in question pass even without this section of this
change. Commit 018b61546e also causes interoperability issues
with the RI and causes DateFormatFieldTest to fail.
More fundamentally, the mapping between Field.TIME_ZONE and
Calendar.ZONE_OFFSET seems incorrect because the format classes
manipulate Calendar#zone via setTimeZone and getTimeZone and
do not directly modify the Calendar.ZONE_OFFSET / DST_OFFSET
fields.
bug: 12782114
Change-Id: Id3703a9f4e2ff3e3b24d4a45205722f72f440ba8
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/java/text/DateFormat.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/java/java/text/DateFormat.java b/luni/src/main/java/java/text/DateFormat.java index 049ddf98..64784b7 100644 --- a/luni/src/main/java/java/text/DateFormat.java +++ b/luni/src/main/java/java/text/DateFormat.java @@ -766,7 +766,7 @@ public abstract class DateFormat extends Format { /** * Marks the time zone part of a date. */ - public static final Field TIME_ZONE = new Field("time zone", Calendar.ZONE_OFFSET); + public static final Field TIME_ZONE = new Field("time zone", -1); /** * The calendar field that this field represents. |