Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simplify APIs exposed for time zone lookups" am: 07dcc4bc0f

Browse Source 
am: a7d5a3220a

Change-Id: I058dbe387bbebe61eb03507e64285fa27f0b7108
This commit is contained in:
Neil Fuller
2019-09-10 04:17:20 -07:00
committed by android-build-merger
parent ca61da8141 a7d5a3220a
commit e5c466d3f5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/util/TimeUtils.java
View File

@@ -62,9 +62,9 @@ public class TimeUtils {
}
/**
* Tries to return a frozen ICU time zone that would have had the specified offset
* and DST value at the specified moment in the specified country.
* Returns null if no suitable zone could be found.
* Returns a frozen ICU time zone that has / would have had the specified offset and DST value
* at the specified moment in the specified country. Returns null if no suitable zone could be
* found.
*/
private static android.icu.util.TimeZone getIcuTimeZone(
int offset, boolean dst, long when, String country) {
@@ -73,8 +73,15 @@ public class TimeUtils {
}
android.icu.util.TimeZone bias = android.icu.util.TimeZone.getDefault();
return TimeZoneFinder.getInstance()
.lookupTimeZoneByCountryAndOffset(country, offset, dst, when, bias);
CountryTimeZones countryTimeZones =
TimeZoneFinder.getInstance().lookupCountryTimeZones(country);
if (countryTimeZones == null) {
return null;
}
CountryTimeZones.OffsetResult offsetResult =
countryTimeZones.lookupByOffsetWithBias(offset, dst, when, bias);
return offsetResult != null ? offsetResult.mTimeZone : null;
}
/**