Merge "Renamed retry interval to retry duration" (1903d3eb) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -12081,7 +12081,7 @@ package android.telephony.data {
		method public int getMtuV6();
		method @NonNull public java.util.List<java.net.InetAddress> getPcscfAddresses();
		method public int getProtocolType();
		method public long getRetryIntervalMillis();
		method public long getRetryDurationMillis();
		method @Deprecated public int getSuggestedRetryTime();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;
		@@ -12094,7 +12094,7 @@ package android.telephony.data {
		field public static final int LINK_STATUS_DORMANT = 1; // 0x1
		field public static final int LINK_STATUS_INACTIVE = 0; // 0x0
		field public static final int LINK_STATUS_UNKNOWN = -1; // 0xffffffff
		field public static final int RETRY_INTERVAL_UNDEFINED = -1; // 0xffffffff
		field public static final int RETRY_DURATION_UNDEFINED = -1; // 0xffffffff
		}

		public static final class DataCallResponse.Builder {
		@@ -12113,7 +12113,7 @@ package android.telephony.data {
		method @NonNull public android.telephony.data.DataCallResponse.Builder setMtuV6(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setPcscfAddresses(@NonNull java.util.List<java.net.InetAddress>);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setProtocolType(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setRetryIntervalMillis(long);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setRetryDurationMillis(long);
		method @Deprecated @NonNull public android.telephony.data.DataCallResponse.Builder setSuggestedRetryTime(int);
		}

core/api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -10922,7 +10922,7 @@ package android.telephony.data {
		method public int getMtuV6();
		method @NonNull public java.util.List<java.net.InetAddress> getPcscfAddresses();
		method public int getProtocolType();
		method public long getRetryIntervalMillis();
		method public long getRetryDurationMillis();
		method @Deprecated public int getSuggestedRetryTime();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;
		@@ -10935,7 +10935,7 @@ package android.telephony.data {
		field public static final int LINK_STATUS_DORMANT = 1; // 0x1
		field public static final int LINK_STATUS_INACTIVE = 0; // 0x0
		field public static final int LINK_STATUS_UNKNOWN = -1; // 0xffffffff
		field public static final int RETRY_INTERVAL_UNDEFINED = -1; // 0xffffffff
		field public static final int RETRY_DURATION_UNDEFINED = -1; // 0xffffffff
		}

		public static final class DataCallResponse.Builder {
		@@ -10954,7 +10954,7 @@ package android.telephony.data {
		method @NonNull public android.telephony.data.DataCallResponse.Builder setMtuV6(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setPcscfAddresses(@NonNull java.util.List<java.net.InetAddress>);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setProtocolType(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setRetryIntervalMillis(long);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setRetryDurationMillis(long);
		method @Deprecated @NonNull public android.telephony.data.DataCallResponse.Builder setSuggestedRetryTime(int);
		}

telephony/java/android/telephony/data/DataCallResponse.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -110,10 +110,10 @@ public final class DataCallResponse implements Parcelable {
		public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3;

		/**
		* Indicates that data retry interval is not specified. Platform can determine when to
		* Indicates that data retry duration is not specified. Platform can determine when to
		* perform data setup appropriately.
		*/
		public static final int RETRY_INTERVAL_UNDEFINED = -1;
		public static final int RETRY_DURATION_UNDEFINED = -1;

		private final @DataFailureCause int mCause;
		private final long mSuggestedRetryTime;
		@@ -236,12 +236,12 @@ public final class DataCallResponse implements Parcelable {
		/**
		* @return The suggested data retry time in milliseconds.
		*
		* @deprecated Use {@link #getRetryIntervalMillis()} instead.
		* @deprecated Use {@link #getRetryDurationMillis()} instead.
		*/
		@Deprecated
		public int getSuggestedRetryTime() {
		// To match the pre-deprecated getSuggestedRetryTime() behavior.
		if (mSuggestedRetryTime == RETRY_INTERVAL_UNDEFINED) {
		if (mSuggestedRetryTime == RETRY_DURATION_UNDEFINED) {
		return 0;
		} else if (mSuggestedRetryTime > Integer.MAX_VALUE) {
		return Integer.MAX_VALUE;
		@@ -250,11 +250,11 @@ public final class DataCallResponse implements Parcelable {
		}

		/**
		* @return The network suggested data retry interval in milliseconds. {@code Long.MAX_VALUE}
		* indicates data retry should not occur. {@link #RETRY_INTERVAL_UNDEFINED} indicates network
		* did not suggest any retry interval.
		* @return The network suggested data retry duration in milliseconds. {@code Long.MAX_VALUE}
		* indicates data retry should not occur. {@link #RETRY_DURATION_UNDEFINED} indicates network
		* did not suggest any retry duration.
		*/
		public long getRetryIntervalMillis() {
		public long getRetryDurationMillis() {
		return mSuggestedRetryTime;
		}

		@@ -472,7 +472,7 @@ public final class DataCallResponse implements Parcelable {
		public static final class Builder {
		private @DataFailureCause int mCause;

		private long mSuggestedRetryTime = RETRY_INTERVAL_UNDEFINED;
		private long mSuggestedRetryTime = RETRY_DURATION_UNDEFINED;

		private int mId;

		@@ -521,7 +521,7 @@ public final class DataCallResponse implements Parcelable {
		* @param suggestedRetryTime The suggested data retry time in milliseconds.
		* @return The same instance of the builder.
		*
		* @deprecated Use {@link #setRetryIntervalMillis(long)} instead.
		* @deprecated Use {@link #setRetryDurationMillis(long)} instead.
		*/
		@Deprecated
		public @NonNull Builder setSuggestedRetryTime(int suggestedRetryTime) {
		@@ -530,13 +530,13 @@ public final class DataCallResponse implements Parcelable {
		}

		/**
		* Set the network suggested data retry interval.
		* Set the network suggested data retry duration.
		*
		* @param retryIntervalMillis The suggested data retry interval in milliseconds.
		* @param retryDurationMillis The suggested data retry duration in milliseconds.
		* @return The same instance of the builder.
		*/
		public @NonNull Builder setRetryIntervalMillis(long retryIntervalMillis) {
		mSuggestedRetryTime = retryIntervalMillis;
		public @NonNull Builder setRetryDurationMillis(long retryDurationMillis) {
		mSuggestedRetryTime = retryDurationMillis;
		return this;
		}