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

Merge "Use ICU APIs not impl types" am: 811d817368 am: 09dcb87982

Browse Source 
am: ccef9d9dc2

Change-Id: I302247aa892e018e58b6742f55d30c971a4f77f3
This commit is contained in:
Neil Fuller
2018-10-02 06:29:44 -07:00
committed by android-build-merger
parent b021f3285b ccef9d9dc2
commit 5b88d6e6ba
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
View File

@@ -17,10 +17,10 @@
package com.android.settings.datetime.timezone; package com.android.settings.datetime.timezone;
import android.content.Context; import android.content.Context;
import android.icu.impl.OlsonTimeZone;
import android.icu.text.DateFormat; import android.icu.text.DateFormat;
import android.icu.text.DisplayContext; import android.icu.text.DisplayContext;
import android.icu.text.SimpleDateFormat; import android.icu.text.SimpleDateFormat;
import android.icu.util.BasicTimeZone;
import android.icu.util.Calendar; import android.icu.util.Calendar;
import android.icu.util.TimeZone; import android.icu.util.TimeZone;
import android.icu.util.TimeZoneTransition; import android.icu.util.TimeZoneTransition;
@@ -115,17 +115,17 @@ public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceCont
} }
private TimeZoneTransition findNextDstTransition(TimeZone timeZone) { private TimeZoneTransition findNextDstTransition(TimeZone timeZone) {
if (!(timeZone instanceof OlsonTimeZone)) { if (!(timeZone instanceof BasicTimeZone)) {
return null; return null;
} }
final OlsonTimeZone olsonTimeZone = (OlsonTimeZone) timeZone; final BasicTimeZone basicTimeZone = (BasicTimeZone) timeZone;
TimeZoneTransition transition = olsonTimeZone.getNextTransition( TimeZoneTransition transition = basicTimeZone.getNextTransition(
mDate.getTime(), /* inclusive */ false); mDate.getTime(), /* inclusive */ false);
do { do {
if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) { if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) {
break; break;
} }
transition = olsonTimeZone.getNextTransition( transition = basicTimeZone.getNextTransition(
transition.getTime(), /*inclusive */ false); transition.getTime(), /*inclusive */ false);
} while (transition != null); } while (transition != null);
return transition; return transition;