Merge "Undo commit "Expose constants in Telephony.Carriers"" (774efe07) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/data/ApnSetting.java

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -125,6 +125,15 @@ public class ApnSetting implements Parcelable {
	/** Authentication type for PAP or CHAP. */		/** Authentication type for PAP or CHAP. */
	public static final int AUTH_TYPE_PAP_OR_CHAP = 3;		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		* 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		* entry. One APN entry may support multiple APN types, eg, a single APN
	@@ -741,7 +750,7 @@ public class ApnSetting implements Parcelable {
	* @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE		* @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE
	* @hide		* @hide
	*/		*/
	@Carriers.Skip464XlatStatus		@Skip464XlatStatus
	public int getSkip464Xlat() {		public int getSkip464Xlat() {
	return mSkip464Xlat;		return mSkip464Xlat;
	}		}
	@@ -2061,7 +2070,7 @@ public class ApnSetting implements Parcelable {
	* @param skip464xlat skip464xlat for this APN		* @param skip464xlat skip464xlat for this APN
	* @hide		* @hide
	*/		*/
	public Builder setSkip464Xlat(@Carriers.Skip464XlatStatus int skip464xlat) {		public Builder setSkip464Xlat(@Skip464XlatStatus int skip464xlat) {
	this.mSkip464Xlat = skip464xlat;		this.mSkip464Xlat = skip464xlat;
	return this;		return this;
	}		}