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

Simplify APIs exposed for time zone lookups

Browse Source 
The libcore.timezone APIs may form the basis for some
new SystemApis. Before starting that process the API
surface is being rationalized to establish the core
use cases.

Test: Treehugger
Bug: 139091367
Change-Id: I6c8b791524d16223c414612913b22f4d70c27d61
This commit is contained in:
Neil Fuller
2019-08-19 20:39:30 +01:00
parent 3628bb3a64
commit 400efa36ef
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;
}
/**