Merge "API council requested tweaks to SubscriptionPlan." into pi-dev (4cd485f8) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −4

Original line number	Diff line number	Diff line
		@@ -42405,7 +42405,7 @@ package android.telephony {
		}

		public final class SubscriptionPlan implements android.os.Parcelable {
		method public java.util.Iterator<android.util.Pair<java.time.ZonedDateTime, java.time.ZonedDateTime>> cycleIterator();
		method public java.util.Iterator<android.util.Range<java.time.ZonedDateTime>> cycleIterator();
		method public int describeContents();
		method public int getDataLimitBehavior();
		method public long getDataLimitBytes();
		@@ -42427,9 +42427,7 @@ package android.telephony {
		public static class SubscriptionPlan.Builder {
		method public android.telephony.SubscriptionPlan build();
		method public static android.telephony.SubscriptionPlan.Builder createNonrecurring(java.time.ZonedDateTime, java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringDaily(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringMonthly(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringWeekly(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurring(java.time.ZonedDateTime, java.time.Period);
		method public android.telephony.SubscriptionPlan.Builder setDataLimit(long, int);
		method public android.telephony.SubscriptionPlan.Builder setDataUsage(long, long);
		method public android.telephony.SubscriptionPlan.Builder setSummary(java.lang.CharSequence);

api/system-current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -5191,7 +5191,7 @@ package android.telephony {
		}

		public final class SubscriptionPlan implements android.os.Parcelable {
		method public java.util.Iterator<android.util.Pair<java.time.ZonedDateTime, java.time.ZonedDateTime>> cycleIterator();
		method public java.util.Iterator<android.util.Range<java.time.ZonedDateTime>> cycleIterator();
		method public int describeContents();
		method public int getDataLimitBehavior();
		method public long getDataLimitBytes();
		@@ -5213,9 +5213,10 @@ package android.telephony {
		public static class SubscriptionPlan.Builder {
		method public android.telephony.SubscriptionPlan build();
		method public static android.telephony.SubscriptionPlan.Builder createNonrecurring(java.time.ZonedDateTime, java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringDaily(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringMonthly(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringWeekly(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurring(java.time.ZonedDateTime, java.time.Period);
		method public static deprecated android.telephony.SubscriptionPlan.Builder createRecurringDaily(java.time.ZonedDateTime);
		method public static deprecated android.telephony.SubscriptionPlan.Builder createRecurringMonthly(java.time.ZonedDateTime);
		method public static deprecated android.telephony.SubscriptionPlan.Builder createRecurringWeekly(java.time.ZonedDateTime);
		method public android.telephony.SubscriptionPlan.Builder setDataLimit(long, int);
		method public android.telephony.SubscriptionPlan.Builder setDataUsage(long, long);
		method public android.telephony.SubscriptionPlan.Builder setSummary(java.lang.CharSequence);

core/java/android/net/NetworkPolicy.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package android.net;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.BackupUtils;
		import android.util.Pair;
		import android.util.Range;
		import android.util.RecurrenceRule;

		import com.android.internal.util.Preconditions;
		@@ -136,7 +136,7 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> {
		return 0;
		}

		public Iterator<Pair<ZonedDateTime, ZonedDateTime>> cycleIterator() {
		public Iterator<Range<ZonedDateTime>> cycleIterator() {
		return cycleRule.cycleIterator();
		}

core/java/android/net/NetworkPolicyManager.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.os.RemoteException;
		import android.os.UserHandle;
		import android.util.DebugUtils;
		import android.util.Pair;
		import android.util.Range;

		import com.google.android.collect.Sets;

		@@ -258,8 +259,21 @@ public class NetworkPolicyManager {
		}

		/** {@hide} */
		@Deprecated
		public static Iterator<Pair<ZonedDateTime, ZonedDateTime>> cycleIterator(NetworkPolicy policy) {
		return policy.cycleIterator();
		final Iterator<Range<ZonedDateTime>> it = policy.cycleIterator();
		return new Iterator<Pair<ZonedDateTime, ZonedDateTime>>() {
		@Override
		public boolean hasNext() {
		return it.hasNext();
		}

		@Override
		public Pair<ZonedDateTime, ZonedDateTime> next() {
		final Range<ZonedDateTime> r = it.next();
		return Pair.create(r.getLower(), r.getUpper());
		}
		};
		}

		/**

core/java/android/util/RecurrenceRule.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ public class RecurrenceRule implements Parcelable {
		&& period.getDays() == 0;
		}

		public Iterator<Pair<ZonedDateTime, ZonedDateTime>> cycleIterator() {
		public Iterator<Range<ZonedDateTime>> cycleIterator() {
		if (period != null) {
		return new RecurringIterator();
		} else {
		@@ -166,7 +166,7 @@ public class RecurrenceRule implements Parcelable {
		}
		}

		private class NonrecurringIterator implements Iterator<Pair<ZonedDateTime, ZonedDateTime>> {
		private class NonrecurringIterator implements Iterator<Range<ZonedDateTime>> {
		boolean hasNext;

		public NonrecurringIterator() {
		@@ -179,13 +179,13 @@ public class RecurrenceRule implements Parcelable {
		}

		@Override
		public Pair<ZonedDateTime, ZonedDateTime> next() {
		public Range<ZonedDateTime> next() {
		hasNext = false;
		return new Pair<>(start, end);
		return new Range<>(start, end);
		}
		}

		private class RecurringIterator implements Iterator<Pair<ZonedDateTime, ZonedDateTime>> {
		private class RecurringIterator implements Iterator<Range<ZonedDateTime>> {
		int i;
		ZonedDateTime cycleStart;
		ZonedDateTime cycleEnd;
		@@ -231,12 +231,12 @@ public class RecurrenceRule implements Parcelable {
		}

		@Override
		public Pair<ZonedDateTime, ZonedDateTime> next() {
		public Range<ZonedDateTime> next() {
		if (LOGD) Log.d(TAG, "Cycle " + i + " from " + cycleStart + " to " + cycleEnd);
		Pair<ZonedDateTime, ZonedDateTime> p = new Pair<>(cycleStart, cycleEnd);
		Range<ZonedDateTime> r = new Range<>(cycleStart, cycleEnd);
		i--;
		updateCycle();
		return p;
		return r;
		}
		}