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

Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc94

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955196

Change-Id: I8a38f7bd32831e5bdc829c61db923527238cd9cd
This commit is contained in:
Treehugger Robot
2022-03-09 17:39:23 +00:00
committed by Automerger Merge Worker
parent 4c89f808f1 4ac3fffc94
commit 00f50c6804
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -42065,6 +42065,7 @@ package android.telephony.data {
field public static final int TYPE_DEFAULT = 17; // 0x11 field public static final int TYPE_DEFAULT = 17; // 0x11
field public static final int TYPE_DUN = 8; // 0x8 field public static final int TYPE_DUN = 8; // 0x8
field public static final int TYPE_EMERGENCY = 512; // 0x200 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_FOTA = 32; // 0x20
field public static final int TYPE_HIPRI = 16; // 0x10 field public static final int TYPE_HIPRI = 16; // 0x10
field public static final int TYPE_IA = 256; // 0x100 field public static final int TYPE_IA = 256; // 0x100

1
core/api/system-current.txt
View File

@@ -11999,6 +11999,7 @@ package android.telephony.data {
field public static final String TYPE_DEFAULT_STRING = "default"; field public static final String TYPE_DEFAULT_STRING = "default";
field public static final String TYPE_DUN_STRING = "dun"; field public static final String TYPE_DUN_STRING = "dun";
field public static final String TYPE_EMERGENCY_STRING = "emergency"; 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_FOTA_STRING = "fota";
field public static final String TYPE_HIPRI_STRING = "hipri"; field public static final String TYPE_HIPRI_STRING = "hipri";
field public static final String TYPE_IA_STRING = "ia"; field public static final String TYPE_IA_STRING = "ia";

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

@@ -118,11 +118,9 @@ public class ApnSetting implements Parcelable {
public static final int TYPE_VSIM = 1 << 12; // TODO: Refer to ApnTypes.VSIM public static final int TYPE_VSIM = 1 << 12; // TODO: Refer to ApnTypes.VSIM
/** APN type for BIP. */ /** APN type for BIP. */
public static final int TYPE_BIP = 1 << 13; // TODO: Refer to ApnTypes.BIP public static final int TYPE_BIP = 1 << 13; // TODO: Refer to ApnTypes.BIP
/** /** APN type for ENTERPRISE. */
* APN type for ENTERPRISE. public static final int TYPE_ENTERPRISE = 1 << 14; //TODO: In future should be referenced from
* @hide // hardware.interfaces.radio.data.ApnTypes
*/
public static final int TYPE_ENTERPRISE = TYPE_BIP << 1;
/** @hide */ /** @hide */
@IntDef(flag = true, prefix = {"TYPE_"}, value = { @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. * modem components or carriers. Non-system apps should use the integer variants instead.
* @hide * @hide
*/ */
@SystemApi
public static final String TYPE_ENTERPRISE_STRING = "enterprise"; public static final String TYPE_ENTERPRISE_STRING = "enterprise";