Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Undo commit "Expose constants in Telephony.Carriers""

Browse Source
This commit is contained in:
Daniel Bright
2020-03-12 01:07:30 +00:00
committed by Gerrit Code Review
parent 49d765ee67 9fe427c9d2
commit 774efe07e9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -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;
} }