Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58e10d9 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Track move of timezone classes to libcore.timezone"

parents 0b69021d 164394db

core/java/android/util/TimeUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.annotation.Nullable; 
import android.annotation.UnsupportedAppUsage;

import android.os.SystemClock;



import libcore.util.CountryTimeZones;

import libcore.util.CountryTimeZones.TimeZoneMapping;

import libcore.util.TimeZoneFinder;

import libcore.timezone.CountryTimeZones;

import libcore.timezone.CountryTimeZones.TimeZoneMapping;

import libcore.timezone.TimeZoneFinder;

import libcore.util.ZoneInfoDB;



import java.io.PrintWriter;

packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import androidx.core.text.TextDirectionHeuristicsCompat; 


import com.android.settingslib.R;



import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;



import org.xmlpull.v1.XmlPullParserException;

services/core/java/com/android/server/timezone/RulesManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import java.util.concurrent.Executor; 
import java.util.concurrent.atomic.AtomicBoolean;

import libcore.icu.ICU;

import libcore.timezone.TzDataSetVersion;

import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;

import libcore.util.ZoneInfoDB;



import static android.app.timezone.RulesState.DISTRO_STATUS_INSTALLED;