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

Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 am: 1c44c3b771 am: 4d9269062b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: I5ddccd8769e07dd201d4902c2e4a519c57204bad
This commit is contained in:
vichang
2020-07-02 11:03:47 +00:00
committed by Automerger Merge Worker
parent 992fdbd210 4d9269062b
commit 542d231ddd
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/timezone/CountryTimeZones.java
View File

@@ -40,9 +40,9 @@ public final class CountryTimeZones {
public static final class TimeZoneMapping { public static final class TimeZoneMapping {
@NonNull @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); this.mDelegate = Objects.requireNonNull(delegate);
} }
@@ -147,9 +147,9 @@ public final class CountryTimeZones {
} }
@NonNull @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; mDelegate = delegate;
} }
@@ -221,7 +221,7 @@ public final class CountryTimeZones {
@Nullable @Nullable
public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias, public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias,
int totalOffsetMillis, boolean isDst) { int totalOffsetMillis, boolean isDst) {
libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = com.android.i18n.timezone.CountryTimeZones.OffsetResult delegateOffsetResult =
mDelegate.lookupByOffsetWithBias( mDelegate.lookupByOffsetWithBias(
whenMillis, bias, totalOffsetMillis, isDst); whenMillis, bias, totalOffsetMillis, isDst);
return delegateOffsetResult == null ? null : return delegateOffsetResult == null ? null :
@@ -244,7 +244,7 @@ public final class CountryTimeZones {
@Nullable @Nullable
public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias, public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias,
int totalOffsetMillis) { int totalOffsetMillis) {
libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult = com.android.i18n.timezone.CountryTimeZones.OffsetResult delegateOffsetResult =
mDelegate.lookupByOffsetWithBias(whenMillis, bias, totalOffsetMillis); mDelegate.lookupByOffsetWithBias(whenMillis, bias, totalOffsetMillis);
return delegateOffsetResult == null ? null : return delegateOffsetResult == null ? null :
new OffsetResult( new OffsetResult(
@@ -260,11 +260,12 @@ public final class CountryTimeZones {
*/ */
@NonNull @NonNull
public List<TimeZoneMapping> getEffectiveTimeZoneMappingsAt(long whenMillis) { public List<TimeZoneMapping> getEffectiveTimeZoneMappingsAt(long whenMillis) {
List<libcore.timezone.CountryTimeZones.TimeZoneMapping> delegateList = List<com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping> delegateList =
mDelegate.getEffectiveTimeZoneMappingsAt(whenMillis); mDelegate.getEffectiveTimeZoneMappingsAt(whenMillis);
List<TimeZoneMapping> toReturn = new ArrayList<>(delegateList.size()); 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)); toReturn.add(new TimeZoneMapping(delegateMapping));
} }
return Collections.unmodifiableList(toReturn); return Collections.unmodifiableList(toReturn);

9
core/java/android/timezone/TelephonyLookup.java
View File

@@ -41,16 +41,17 @@ public final class TelephonyLookup {
public static TelephonyLookup getInstance() { public static TelephonyLookup getInstance() {
synchronized (sLock) { synchronized (sLock) {
if (sInstance == null) { if (sInstance == null) {
sInstance = new TelephonyLookup(libcore.timezone.TelephonyLookup.getInstance()); sInstance = new TelephonyLookup(com.android.i18n.timezone.TelephonyLookup
.getInstance());
} }
return sInstance; return sInstance;
} }
} }
@NonNull @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); mDelegate = Objects.requireNonNull(delegate);
} }
@@ -60,7 +61,7 @@ public final class TelephonyLookup {
*/ */
@Nullable @Nullable
public TelephonyNetworkFinder getTelephonyNetworkFinder() { public TelephonyNetworkFinder getTelephonyNetworkFinder() {
libcore.timezone.TelephonyNetworkFinder telephonyNetworkFinderDelegate = com.android.i18n.timezone.TelephonyNetworkFinder telephonyNetworkFinderDelegate =
mDelegate.getTelephonyNetworkFinder(); mDelegate.getTelephonyNetworkFinder();
return telephonyNetworkFinderDelegate != null return telephonyNetworkFinderDelegate != null
? new TelephonyNetworkFinder(telephonyNetworkFinderDelegate) : null; ? new TelephonyNetworkFinder(telephonyNetworkFinderDelegate) : null;

4
core/java/android/timezone/TelephonyNetwork.java
View File

@@ -28,9 +28,9 @@ import java.util.Objects;
public final class TelephonyNetwork { public final class TelephonyNetwork {
@NonNull @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); mDelegate = Objects.requireNonNull(delegate);
} }

6
core/java/android/timezone/TelephonyNetworkFinder.java
View File

@@ -29,9 +29,9 @@ import java.util.Objects;
public final class TelephonyNetworkFinder { public final class TelephonyNetworkFinder {
@NonNull @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); mDelegate = Objects.requireNonNull(delegate);
} }
@@ -45,7 +45,7 @@ public final class TelephonyNetworkFinder {
Objects.requireNonNull(mcc); Objects.requireNonNull(mcc);
Objects.requireNonNull(mnc); Objects.requireNonNull(mnc);
libcore.timezone.TelephonyNetwork telephonyNetworkDelegate = com.android.i18n.timezone.TelephonyNetwork telephonyNetworkDelegate =
mDelegate.findNetworkByMccMnc(mcc, mnc); mDelegate.findNetworkByMccMnc(mcc, mnc);
return telephonyNetworkDelegate != null return telephonyNetworkDelegate != null
? new TelephonyNetwork(telephonyNetworkDelegate) : null; ? new TelephonyNetwork(telephonyNetworkDelegate) : null;

10
core/java/android/timezone/TimeZoneFinder.java
View File

@@ -41,16 +41,17 @@ public final class TimeZoneFinder {
public static TimeZoneFinder getInstance() { public static TimeZoneFinder getInstance() {
synchronized (sLock) { synchronized (sLock) {
if (sInstance == null) { if (sInstance == null) {
sInstance = new TimeZoneFinder(libcore.timezone.TimeZoneFinder.getInstance()); sInstance = new TimeZoneFinder(com.android.i18n.timezone.TimeZoneFinder
.getInstance());
} }
} }
return sInstance; return sInstance;
} }
@NonNull @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); mDelegate = Objects.requireNonNull(delegate);
} }
@@ -70,7 +71,8 @@ public final class TimeZoneFinder {
*/ */
@Nullable @Nullable
public CountryTimeZones lookupCountryTimeZones(@NonNull String countryIso) { 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); return delegate == null ? null : new CountryTimeZones(delegate);
} }
} }

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

@@ -23,12 +23,11 @@ import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; 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 com.android.i18n.timezone.ZoneInfoDb;
import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.TimeZoneFinder;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalTime; import java.time.LocalTime;

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

@@ -32,12 +32,11 @@ import androidx.annotation.VisibleForTesting;
import androidx.core.text.BidiFormatter; import androidx.core.text.BidiFormatter;
import androidx.core.text.TextDirectionHeuristicsCompat; 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 com.android.settingslib.R;
import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.TimeZoneFinder;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import java.util.ArrayList; import java.util.ArrayList;

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

@@ -38,6 +38,7 @@ import android.os.RemoteException;
import android.util.Slog; import android.util.Slog;
import com.android.i18n.timezone.TimeZoneDataFiles; import com.android.i18n.timezone.TimeZoneDataFiles;
import com.android.i18n.timezone.TimeZoneFinder;
import com.android.i18n.timezone.TzDataSetVersion; import com.android.i18n.timezone.TzDataSetVersion;
import com.android.i18n.timezone.ZoneInfoDb; import com.android.i18n.timezone.ZoneInfoDb;
import com.android.internal.annotations.VisibleForTesting; 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.TimeZoneDistro;
import com.android.timezone.distro.installer.TimeZoneDistroInstaller; import com.android.timezone.distro.installer.TimeZoneDistroInstaller;
import libcore.timezone.TimeZoneFinder;
import java.io.File; import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;