diff options
8 files changed, 32 insertions, 30 deletions
diff --git a/core/java/android/timezone/CountryTimeZones.java b/core/java/android/timezone/CountryTimeZones.java index 8fd303b8a64c..44d140242409 100644 --- a/core/java/android/timezone/CountryTimeZones.java +++ b/core/java/android/timezone/CountryTimeZones.java @@ -40,9 +40,9 @@ public final class CountryTimeZones { public static final class TimeZoneMapping { @NonNull - private libcore.timezone.CountryTimeZones.TimeZoneMapping mDelegate; + private com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping mDelegate; - TimeZoneMapping(libcore.timezone.CountryTimeZones.TimeZoneMapping delegate) { + TimeZoneMapping(com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping delegate) { this.mDelegate = Objects.requireNonNull(delegate); } @@ -147,9 +147,9 @@ public final class CountryTimeZones { } @NonNull - private final libcore.timezone.CountryTimeZones mDelegate; + private final com.android.i18n.timezone.CountryTimeZones mDelegate; - CountryTimeZones(libcore.timezone.CountryTimeZones delegate) { + CountryTimeZones(com.android.i18n.timezone.CountryTimeZones delegate) { mDelegate = delegate; } @@ -221,7 +221,7 @@ public final class CountryTimeZones { @Nullable public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias, int totalOffsetMillis, boolean isDst) { - libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = + com.android.i18n.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = mDelegate.lookupByOffsetWithBias( whenMillis, bias, totalOffsetMillis, isDst); return delegateOffsetResult == null ? null : @@ -244,7 +244,7 @@ public final class CountryTimeZones { @Nullable public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias, int totalOffsetMillis) { - libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = + com.android.i18n.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = mDelegate.lookupByOffsetWithBias(whenMillis, bias, totalOffsetMillis); return delegateOffsetResult == null ? null : new OffsetResult( @@ -260,11 +260,12 @@ public final class CountryTimeZones { */ @NonNull public List<TimeZoneMapping> getEffectiveTimeZoneMappingsAt(long whenMillis) { - List<libcore.timezone.CountryTimeZones.TimeZoneMapping> delegateList = + List<com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping> delegateList = mDelegate.getEffectiveTimeZoneMappingsAt(whenMillis); List<TimeZoneMapping> toReturn = new ArrayList<>(delegateList.size()); - for (libcore.timezone.CountryTimeZones.TimeZoneMapping delegateMapping : delegateList) { + for (com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping delegateMapping + : delegateList) { toReturn.add(new TimeZoneMapping(delegateMapping)); } return Collections.unmodifiableList(toReturn); diff --git a/core/java/android/timezone/TelephonyLookup.java b/core/java/android/timezone/TelephonyLookup.java index a4c3fbd33410..c97bf28cebfe 100644 --- a/core/java/android/timezone/TelephonyLookup.java +++ b/core/java/android/timezone/TelephonyLookup.java @@ -41,16 +41,17 @@ public final class TelephonyLookup { public static TelephonyLookup getInstance() { synchronized (sLock) { if (sInstance == null) { - sInstance = new TelephonyLookup(libcore.timezone.TelephonyLookup.getInstance()); + sInstance = new TelephonyLookup(com.android.i18n.timezone.TelephonyLookup + .getInstance()); } return sInstance; } } @NonNull - private final libcore.timezone.TelephonyLookup mDelegate; + private final com.android.i18n.timezone.TelephonyLookup mDelegate; - private TelephonyLookup(@NonNull libcore.timezone.TelephonyLookup delegate) { + private TelephonyLookup(@NonNull com.android.i18n.timezone.TelephonyLookup delegate) { mDelegate = Objects.requireNonNull(delegate); } @@ -60,7 +61,7 @@ public final class TelephonyLookup { */ @Nullable public TelephonyNetworkFinder getTelephonyNetworkFinder() { - libcore.timezone.TelephonyNetworkFinder telephonyNetworkFinderDelegate = + com.android.i18n.timezone.TelephonyNetworkFinder telephonyNetworkFinderDelegate = mDelegate.getTelephonyNetworkFinder(); return telephonyNetworkFinderDelegate != null ? new TelephonyNetworkFinder(telephonyNetworkFinderDelegate) : null; diff --git a/core/java/android/timezone/TelephonyNetwork.java b/core/java/android/timezone/TelephonyNetwork.java index 823cd251fbf0..3b65c6ffc379 100644 --- a/core/java/android/timezone/TelephonyNetwork.java +++ b/core/java/android/timezone/TelephonyNetwork.java @@ -28,9 +28,9 @@ import java.util.Objects; public final class TelephonyNetwork { @NonNull - private final libcore.timezone.TelephonyNetwork mDelegate; + private final com.android.i18n.timezone.TelephonyNetwork mDelegate; - TelephonyNetwork(@NonNull libcore.timezone.TelephonyNetwork delegate) { + TelephonyNetwork(@NonNull com.android.i18n.timezone.TelephonyNetwork delegate) { mDelegate = Objects.requireNonNull(delegate); } diff --git a/core/java/android/timezone/TelephonyNetworkFinder.java b/core/java/android/timezone/TelephonyNetworkFinder.java index 4bfeff8a73ad..c69ddf86d3f8 100644 --- a/core/java/android/timezone/TelephonyNetworkFinder.java +++ b/core/java/android/timezone/TelephonyNetworkFinder.java @@ -29,9 +29,9 @@ import java.util.Objects; public final class TelephonyNetworkFinder { @NonNull - private final libcore.timezone.TelephonyNetworkFinder mDelegate; + private final com.android.i18n.timezone.TelephonyNetworkFinder mDelegate; - TelephonyNetworkFinder(libcore.timezone.TelephonyNetworkFinder delegate) { + TelephonyNetworkFinder(com.android.i18n.timezone.TelephonyNetworkFinder delegate) { mDelegate = Objects.requireNonNull(delegate); } @@ -45,7 +45,7 @@ public final class TelephonyNetworkFinder { Objects.requireNonNull(mcc); Objects.requireNonNull(mnc); - libcore.timezone.TelephonyNetwork telephonyNetworkDelegate = + com.android.i18n.timezone.TelephonyNetwork telephonyNetworkDelegate = mDelegate.findNetworkByMccMnc(mcc, mnc); return telephonyNetworkDelegate != null ? new TelephonyNetwork(telephonyNetworkDelegate) : null; diff --git a/core/java/android/timezone/TimeZoneFinder.java b/core/java/android/timezone/TimeZoneFinder.java index 03f5013f230c..bf4275fb5b56 100644 --- a/core/java/android/timezone/TimeZoneFinder.java +++ b/core/java/android/timezone/TimeZoneFinder.java @@ -41,16 +41,17 @@ public final class TimeZoneFinder { public static TimeZoneFinder getInstance() { synchronized (sLock) { if (sInstance == null) { - sInstance = new TimeZoneFinder(libcore.timezone.TimeZoneFinder.getInstance()); + sInstance = new TimeZoneFinder(com.android.i18n.timezone.TimeZoneFinder + .getInstance()); } } return sInstance; } @NonNull - private final libcore.timezone.TimeZoneFinder mDelegate; + private final com.android.i18n.timezone.TimeZoneFinder mDelegate; - private TimeZoneFinder(@NonNull libcore.timezone.TimeZoneFinder delegate) { + private TimeZoneFinder(@NonNull com.android.i18n.timezone.TimeZoneFinder delegate) { mDelegate = Objects.requireNonNull(delegate); } @@ -70,7 +71,8 @@ public final class TimeZoneFinder { */ @Nullable public CountryTimeZones lookupCountryTimeZones(@NonNull String countryIso) { - libcore.timezone.CountryTimeZones delegate = mDelegate.lookupCountryTimeZones(countryIso); + com.android.i18n.timezone.CountryTimeZones delegate = mDelegate + .lookupCountryTimeZones(countryIso); return delegate == null ? null : new CountryTimeZones(delegate); } } diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index b2766a44e036..384040013a6d 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -23,12 +23,11 @@ import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.SystemClock; +import com.android.i18n.timezone.CountryTimeZones; +import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping; +import com.android.i18n.timezone.TimeZoneFinder; import com.android.i18n.timezone.ZoneInfoDb; -import libcore.timezone.CountryTimeZones; -import libcore.timezone.CountryTimeZones.TimeZoneMapping; -import libcore.timezone.TimeZoneFinder; - import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java index 231809bfece4..e5fd0ba5d9bc 100644 --- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java +++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java @@ -32,12 +32,11 @@ import androidx.annotation.VisibleForTesting; import androidx.core.text.BidiFormatter; import androidx.core.text.TextDirectionHeuristicsCompat; +import com.android.i18n.timezone.CountryTimeZones; +import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping; +import com.android.i18n.timezone.TimeZoneFinder; import com.android.settingslib.R; -import libcore.timezone.CountryTimeZones; -import libcore.timezone.CountryTimeZones.TimeZoneMapping; -import libcore.timezone.TimeZoneFinder; - import org.xmlpull.v1.XmlPullParserException; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index d4a71ed27549..fd5c6e91a885 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -38,6 +38,7 @@ import android.os.RemoteException; import android.util.Slog; import com.android.i18n.timezone.TimeZoneDataFiles; +import com.android.i18n.timezone.TimeZoneFinder; import com.android.i18n.timezone.TzDataSetVersion; import com.android.i18n.timezone.ZoneInfoDb; import com.android.internal.annotations.VisibleForTesting; @@ -49,7 +50,6 @@ import com.android.timezone.distro.StagedDistroOperation; import com.android.timezone.distro.TimeZoneDistro; import com.android.timezone.distro.installer.TimeZoneDistroInstaller; -import libcore.timezone.TimeZoneFinder; import java.io.File; import java.io.FileDescriptor; |