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

Merge "Track changes to CountryTimeZones API" am: 28b12c347c am: c30eabfadb am: f19b9eecde

Browse Source 
am: b82115befc

Change-Id: I337c1c16966087cc89b9717e2cd4904d18c5e2bc
This commit is contained in:
Neil Fuller
2019-09-11 04:47:53 -07:00
committed by android-build-merger
parent 6794969589 b82115befc
commit d046fb26f4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,20 +67,19 @@ public class TimeUtils {
* found.
*/
private static android.icu.util.TimeZone getIcuTimeZone(
int offset, boolean dst, long when, String country) {
if (country == null) {
int offsetMillis, boolean isDst, long whenMillis, String countryIso) {
if (countryIso == null) {
return null;
}
android.icu.util.TimeZone bias = android.icu.util.TimeZone.getDefault();
CountryTimeZones countryTimeZones =
TimeZoneFinder.getInstance().lookupCountryTimeZones(country);
TimeZoneFinder.getInstance().lookupCountryTimeZones(countryIso);
if (countryTimeZones == null) {
return null;
}
CountryTimeZones.OffsetResult offsetResult =
countryTimeZones.lookupByOffsetWithBias(offset, dst, when, bias);
CountryTimeZones.OffsetResult offsetResult = countryTimeZones.lookupByOffsetWithBias(
offsetMillis, isDst, null /* dstOffsetMillis */, whenMillis, bias);
return offsetResult != null ? offsetResult.mTimeZone : null;
}