PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect GMT offset in display

Browse Source 
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place

Bug: 77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
This commit is contained in:
Victor Chang
2018-03-28 19:50:06 +01:00
parent 65f09f3091
commit 77f97af8eb
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datetime/timezone/TimeZoneInfo.java
View File

@@ -167,7 +167,7 @@ public class TimeZoneInfo {
public TimeZoneInfo format(TimeZone timeZone) { public TimeZoneInfo format(TimeZone timeZone) {
final String id = timeZone.getID(); final String id = timeZone.getID();
final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames(); 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, final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
javaTimeZone, mNow); javaTimeZone, mNow);
return new TimeZoneInfo.Builder(timeZone) return new TimeZoneInfo.Builder(timeZone)

9
tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
View File

@@ -43,4 +43,13 @@ public class TimeZoneInfoTest {
assertThat(timeZoneInfo.getStandardName()).isEqualTo("Pacific Standard Time"); assertThat(timeZoneInfo.getStandardName()).isEqualTo("Pacific Standard Time");
assertThat(timeZoneInfo.getDaylightName()).isEqualTo("Pacific Daylight Time"); assertThat(timeZoneInfo.getDaylightName()).isEqualTo("Pacific Daylight Time");
} }
@Test
public void getGmtOffset_zoneLordHowe_correctGmtOffset() {
Date date = new Date(1514764800000L); // 00:00 1/1/2018 GMT
Formatter formatter = new Formatter(Locale.US, date);
TimeZoneInfo timeZoneInfo = formatter.format("Australia/Lord_Howe");
assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT+11:00");
}
} }