Merge "Undo commit "Expose constants in Telephony.Carriers"" into rvc-dev (f414c083) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -9435,7 +9435,6 @@ package android.provider {

		public static final class Telephony.Carriers implements android.provider.BaseColumns {
		field public static final String APN_SET_ID = "apn_set_id";
		field @Deprecated public static final String BEARER_BITMASK = "bearer_bitmask";
		field public static final int CARRIER_EDITED = 4; // 0x4
		field @NonNull public static final android.net.Uri DPC_URI;
		field public static final String EDITED_STATUS = "edited";
		@@ -9444,11 +9443,6 @@ package android.provider {
		field public static final String MODEM_PERSIST = "modem_cognitive";
		field public static final String MTU = "mtu";
		field public static final int NO_APN_SET_ID = 0; // 0x0
		field public static final String PROFILE_ID = "profile_id";
		field public static final String SKIP_464XLAT = "skip_464xlat";
		field public static final int SKIP_464XLAT_DEFAULT = -1; // 0xffffffff
		field public static final int SKIP_464XLAT_DISABLE = 0; // 0x0
		field public static final int SKIP_464XLAT_ENABLE = 1; // 0x1
		field public static final String TIME_LIMIT_FOR_MAX_CONNECTIONS = "max_conns_time";
		field public static final int UNEDITED = 0; // 0x0
		field public static final int USER_DELETED = 2; // 0x2

+0 −6

Original line number	Diff line number	Diff line
		@@ -3735,7 +3735,6 @@ public final class Telephony {
		* @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
		*/
		@Deprecated
		@SystemApi
		public static final String BEARER_BITMASK = "bearer_bitmask";

		/**
		@@ -3785,7 +3784,6 @@ public final class Telephony {
		* <p>Type: INTEGER</p>
		*@hide
		*/
		@SystemApi
		public static final String PROFILE_ID = "profile_id";

		/**
		@@ -3986,7 +3984,6 @@ public final class Telephony {
		*
		* @hide
		*/
		@SystemApi
		public static final String SKIP_464XLAT = "skip_464xlat";

		/**
		@@ -3995,7 +3992,6 @@ public final class Telephony {
		*
		* @hide
		*/
		@SystemApi
		public static final int SKIP_464XLAT_DEFAULT = -1;

		/**
		@@ -4004,7 +4000,6 @@ public final class Telephony {
		*
		* @hide
		*/
		@SystemApi
		public static final int SKIP_464XLAT_DISABLE = 0;

		/**
		@@ -4013,7 +4008,6 @@ public final class Telephony {
		*
		* @hide
		*/
		@SystemApi
		public static final int SKIP_464XLAT_ENABLE = 1;

+0 −10

Original line number	Diff line number	Diff line
		package android.telephony;

		import android.annotation.IntDef;
		import android.provider.Telephony;
		import android.telecom.Connection;
		import android.telephony.data.ApnSetting;

		@@ -653,15 +652,6 @@ public class Annotation {
		@Retention(RetentionPolicy.SOURCE)
		public @interface UiccAppType{}

		/** @hide */
		@IntDef({
		Telephony.Carriers.SKIP_464XLAT_DEFAULT,
		Telephony.Carriers.SKIP_464XLAT_DISABLE,
		Telephony.Carriers.SKIP_464XLAT_ENABLE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Skip464XlatStatus {}

		/**
		* Override network type
		*/

+11 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.provider.Telephony;
		import android.provider.Telephony.Carriers;
		import android.telephony.Annotation;
		import android.telephony.Annotation.ApnType;
		import android.telephony.Annotation.NetworkType;
		import android.telephony.ServiceState;
		@@ -126,6 +125,15 @@ public class ApnSetting implements Parcelable {
		/** Authentication type for PAP or CHAP. */
		public static final int AUTH_TYPE_PAP_OR_CHAP = 3;

		/** @hide */
		@IntDef({
		Telephony.Carriers.SKIP_464XLAT_DEFAULT,
		Telephony.Carriers.SKIP_464XLAT_DISABLE,
		Telephony.Carriers.SKIP_464XLAT_ENABLE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Skip464XlatStatus {}

		/**
		* APN types for data connections. These are usage categories for an APN
		* entry. One APN entry may support multiple APN types, eg, a single APN
		@@ -745,7 +753,7 @@ public class ApnSetting implements Parcelable {
		* @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE
		* @hide
		*/
		@Annotation.Skip464XlatStatus
		@Skip464XlatStatus
		public int getSkip464Xlat() {
		return mSkip464Xlat;
		}
		@@ -2065,7 +2073,7 @@ public class ApnSetting implements Parcelable {
		* @param skip464xlat skip464xlat for this APN.
		* @hide
		*/
		public Builder setSkip464Xlat(@Annotation.Skip464XlatStatus int skip464xlat) {
		public Builder setSkip464Xlat(@Skip464XlatStatus int skip464xlat) {
		this.mSkip464Xlat = skip464xlat;
		return this;
		}