commit a895201d05aef86683027f2a31c39b898d12cda5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 19 03:24:17 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 19 03:24:17 2022 +0000
tree 49804be88ad4f0a8472641d541a886eb15186d13
parent b080d092e56f3c9a7ffcaec8627088ba69fa3cb8
parent 52895c12cb3c1c6404b05f638cb9ead1d5493d7a

Merge "Unhide ApnType.ENTERPRISE"

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 2ca3083..03703c6 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -44237,6 +44237,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 0c94fc7..58893ba 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -13203,6 +13203,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 977fe33..cb112cf 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";