Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b03781

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1278bdf9dd8890f6fe76dfd8b3a01b273a22986
This commit is contained in:
Daniel Bright
2021-02-09 17:37:41 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 1 deletions

View File

@@ -10756,7 +10756,6 @@ package android.telephony.data {
method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setSlotIndex(int); method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setSlotIndex(int);
method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setThrottleExpiryTimeMillis(long); method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setThrottleExpiryTimeMillis(long);
method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setTransportType(int); method @NonNull public android.telephony.data.ApnThrottleStatus.Builder setTransportType(int);
field public static final long NO_THROTTLE_EXPIRY_TIME = -1L; // 0xffffffffffffffffL
} }
public final class DataCallResponse implements android.os.Parcelable { public final class DataCallResponse implements android.os.Parcelable {

View File

@@ -261,6 +261,10 @@ public final class ApnThrottleStatus implements Parcelable {
private long mThrottleExpiryTimeMillis; private long mThrottleExpiryTimeMillis;
private @RetryType int mRetryType; private @RetryType int mRetryType;
private @ThrottleType int mThrottleType; private @ThrottleType int mThrottleType;
/**
* @hide
*/
public static final long NO_THROTTLE_EXPIRY_TIME = public static final long NO_THROTTLE_EXPIRY_TIME =
DataCallResponse.RETRY_DURATION_UNDEFINED; DataCallResponse.RETRY_DURATION_UNDEFINED;