Merge "Fix incorrect GMT offset in display" into pi-dev am: caf72cf3ff

am: b074d0640c

Change-Id: I47b47781a53fc090c0f2e5542e134732922da87b
This commit is contained in:
Victor Chang
2018-03-29 00:29:59 +00:00
committed by android-build-merger
2 changed files with 10 additions and 1 deletions

View File

@@ -167,7 +167,7 @@ public class TimeZoneInfo {
public TimeZoneInfo format(TimeZone timeZone) {
final String id = timeZone.getID();
final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
final java.util.TimeZone javaTimeZone = android.icu.impl.TimeZoneAdapter.wrap(timeZone);
final java.util.TimeZone javaTimeZone = java.util.TimeZone.getTimeZone(id);
final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
javaTimeZone, mNow);
return new TimeZoneInfo.Builder(timeZone)