Merge "Move Skip464XlatStatus enum to Telephony/Annotation.java." (c112861f) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -4038,15 +4038,6 @@ public final class Telephony {
		@Retention(RetentionPolicy.SOURCE)
		public @interface EditStatus {}

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

		/**
		* Compat framework change ID for the APN db read permission change.
		*

+10 −0

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;

		@@ -651,4 +652,13 @@ 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 {}
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ 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;
		@@ -744,7 +745,7 @@ public class ApnSetting implements Parcelable {
		* @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE
		* @hide
		*/
		@Carriers.Skip464XlatStatus
		@Annotation.Skip464XlatStatus
		public int getSkip464Xlat() {
		return mSkip464Xlat;
		}
		@@ -2061,10 +2062,10 @@ public class ApnSetting implements Parcelable {
		/**
		* Sets skip464xlat flag for this APN.
		*
		* @param skip464xlat skip464xlat for this APN
		* @param skip464xlat skip464xlat for this APN.
		* @hide
		*/
		public Builder setSkip464Xlat(@Carriers.Skip464XlatStatus int skip464xlat) {
		public Builder setSkip464Xlat(@Annotation.Skip464XlatStatus int skip464xlat) {
		this.mSkip464Xlat = skip464xlat;
		return this;
		}