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

Merge "Move Skip464XlatStatus enum to Telephony/Annotation.java."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-28 05:58:10 +00:00
committed by Android (Google) Code Review
parent 2fd746a56c 14cc219ecd
commit c112861f0a
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Telephony.java
View File

@@ -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
telephony/java/android/telephony/Annotation.java
View File

@@ -1,6 +1,7 @@
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 {}
}

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

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