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

Undo commit "Expose constants in Telephony.Carriers"

Browse Source 
Undid carrier constants as @SystemApis.  Also had to move
constants out of annotation.java because any references in
that specific file need to be to public APIs.

Bug: 148170690
Test: make, flash
Merged-In: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
This commit is contained in:
Daniel Bright
2020-03-10 00:34:16 +00:00
parent 2be788e16d
commit 9fe427c9d2
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. */
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
@@ -741,7 +750,7 @@ public class ApnSetting implements Parcelable {
* @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE
* @hide
*/
@Carriers.Skip464XlatStatus
@Skip464XlatStatus
public int getSkip464Xlat() {
return mSkip464Xlat;
}
@@ -2061,7 +2070,7 @@ public class ApnSetting implements Parcelable {
* @param skip464xlat skip464xlat for this APN
* @hide
*/
public Builder setSkip464Xlat(@Carriers.Skip464XlatStatus int skip464xlat) {
public Builder setSkip464Xlat(@Skip464XlatStatus int skip464xlat) {
this.mSkip464Xlat = skip464xlat;
return this;
}