diff options
| -rw-r--r-- | core/java/android/util/TimeUtils.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index 07cecd38620d..74cff205dabc 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -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; } |