diff options
| author | 2022-03-09 18:02:04 +0000 | |
|---|---|---|
| committer | 2022-03-09 18:02:04 +0000 | |
| commit | f00c01a5765c51b1a1b06cfe479f6ef9adb9e566 (patch) | |
| tree | 5738febb9bc53392e0ec08c5b8662669345d43e8 | |
| parent | 81755b8b4ba32c5c2c685ed0cb66e07b8e2e13d9 (diff) | |
| parent | 00f50c680413acbca31253d721bd426403a08687 (diff) | |
Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc94 am: 00f50c6804
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955196
Change-Id: I34b2c776016345fef890f4ea09eb0acc86d8a021
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/ApnSetting.java | 9 |
3 files changed, 6 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b3a6a6c15532..c5bcc2715c59 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -42065,6 +42065,7 @@ package android.telephony.data { field public static final int TYPE_DEFAULT = 17; // 0x11 field public static final int TYPE_DUN = 8; // 0x8 field public static final int TYPE_EMERGENCY = 512; // 0x200 + field public static final int TYPE_ENTERPRISE = 16384; // 0x4000 field public static final int TYPE_FOTA = 32; // 0x20 field public static final int TYPE_HIPRI = 16; // 0x10 field public static final int TYPE_IA = 256; // 0x100 diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a54fa6097f95..bb9af143b4b4 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -11999,6 +11999,7 @@ package android.telephony.data { field public static final String TYPE_DEFAULT_STRING = "default"; field public static final String TYPE_DUN_STRING = "dun"; field public static final String TYPE_EMERGENCY_STRING = "emergency"; + field public static final String TYPE_ENTERPRISE_STRING = "enterprise"; field public static final String TYPE_FOTA_STRING = "fota"; field public static final String TYPE_HIPRI_STRING = "hipri"; field public static final String TYPE_IA_STRING = "ia"; diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 977fe33988d6..cb112cf3b93a 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -118,11 +118,9 @@ public class ApnSetting implements Parcelable { public static final int TYPE_VSIM = 1 << 12; // TODO: Refer to ApnTypes.VSIM /** APN type for BIP. */ public static final int TYPE_BIP = 1 << 13; // TODO: Refer to ApnTypes.BIP - /** - * APN type for ENTERPRISE. - * @hide - */ - public static final int TYPE_ENTERPRISE = TYPE_BIP << 1; + /** APN type for ENTERPRISE. */ + public static final int TYPE_ENTERPRISE = 1 << 14; //TODO: In future should be referenced from + // hardware.interfaces.radio.data.ApnTypes /** @hide */ @IntDef(flag = true, prefix = {"TYPE_"}, value = { @@ -355,6 +353,7 @@ public class ApnSetting implements Parcelable { * modem components or carriers. Non-system apps should use the integer variants instead. * @hide */ + @SystemApi public static final String TYPE_ENTERPRISE_STRING = "enterprise"; |