commit 52895c12cb3c1c6404b05f638cb9ead1d5493d7a
author Ling Ma <linggm@google.com> Thu Jan 13 19:40:54 2022 +0000
committer Ling Ma <linggm@google.com> Tue Jan 18 20:57:48 2022 +0000
tree 0894d3746ab64e2d078073174768ac6b0a459a4c
parent 2e6243d9000e0e9ce47b1036a51e796a5f81240c

Unhide ApnType.ENTERPRISE

Test: build succeeded
Bug: 214240937
Change-Id: I3ac0ef4b7ee9640f57bfc62e639e4b6a6b89e1ef

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 7f0ff7f..bff08cf 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -44003,6 +44003,7 @@
     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

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index f48d956..3931f29 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -13122,6 +13122,7 @@
     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";

telephony/java/android/telephony/data/ApnSetting.java

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 4ff59b5..acbd64b 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -118,11 +118,9 @@
     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 @@
      * modem components or carriers. Non-system apps should use the integer variants instead.
      * @hide
      */
+    @SystemApi
     public static final String TYPE_ENTERPRISE_STRING = "enterprise";