summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-11-16 21:14:13 +0000
committerNeil Fuller <nfuller@google.com>2018-11-22 09:31:04 +0000
commit164394db8e7d3671ee035c19d23263cbcab623a0 (patch)
tree50cce5cc4a9169c4eb0fc277a56384ba5f8ce985
parentbcec7d0f9fc489331b550ab979dc3f955d123925 (diff)
Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from libcore.util to libcore.timezone. Bug: 119026403 Test: build only Exempt-From-Owner-Approval: Trivial import change Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
-rw-r--r--core/java/android/util/TimeUtils.java6
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java2
-rw-r--r--services/core/java/com/android/server/timezone/RulesManagerService.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java
index 717a85801eba..21c4252a0a7e 100644
--- a/core/java/android/util/TimeUtils.java
+++ b/core/java/android/util/TimeUtils.java
@@ -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;
diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
index 8fac3fd0570c..99d48d3957b6 100644
--- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
@@ -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;
diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java
index c4d285115ce7..da0a794c74f3 100644
--- a/services/core/java/com/android/server/timezone/RulesManagerService.java
+++ b/services/core/java/com/android/server/timezone/RulesManagerService.java
@@ -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;