Merge "Move libcore.timezone to the i18n module - Final part" (35d6ab6a) · Commits · e / os / android_frameworks_base

core/java/android/timezone/CountryTimeZones.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/timezone/TelephonyLookup.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -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;

core/java/android/timezone/TelephonyNetwork.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

core/java/android/timezone/TelephonyNetworkFinder.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

core/java/android/timezone/TimeZoneFinder.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}