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

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

Browse Source 
am: bfd3237eac

Change-Id: Iaec5ec7c3d89e9d44e73656a2f23348cd5606205
This commit is contained in:
Neil Fuller
2018-11-26 15:26:28 -08:00
committed by android-build-merger
parent 6a0161a184 bfd3237eac
commit 0f2e3d68be
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

2
packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
View File

@@ -33,7 +33,7 @@ import android.view.View;
import com.android.settingslib.R;
import libcore.util.TimeZoneFinder;
import libcore.timezone.TimeZoneFinder;
import org.xmlpull.v1.XmlPullParserException;

2
services/core/java/com/android/server/timezone/RulesManagerService.java
View File

@@ -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;