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

Merge "Avoid use of DateUtilsBridge.icuTimeZone()"

Browse Source
This commit is contained in:
Neil Fuller
2018-07-16 07:44:58 +00:00
committed by Gerrit Code Review
parent 3c1604da8b 6d5c4a8d8d
commit e859c42e23
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/DateTimeView.java
View File

@@ -30,7 +30,6 @@ import android.content.IntentFilter;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.icu.util.Calendar;
import android.os.Handler; import android.os.Handler;
import android.text.format.Time; import android.text.format.Time;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -41,6 +40,7 @@ import com.android.internal.R;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
@@ -293,7 +293,7 @@ public class DateTimeView extends TextView {
*/ */
private long computeNextMidnight(TimeZone timeZone) { private long computeNextMidnight(TimeZone timeZone) {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.setTimeZone(libcore.icu.DateUtilsBridge.icuTimeZone(timeZone)); c.setTimeZone(timeZone);
c.add(Calendar.DAY_OF_MONTH, 1); c.add(Calendar.DAY_OF_MONTH, 1);
c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0); c.set(Calendar.MINUTE, 0);