Unhide some CM constants to support unbundling.

The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.

Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439

2 files changed, 45 insertions, 5 deletions

diff --git a/api/current.xml b/api/current.xml
index 92540b1f9715..f3e614a11db6 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -83874,6 +83874,50 @@
  visibility="public"
 >
 </field>
+<field name="TYPE_MOBILE_DUN"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="TYPE_MOBILE_HIPRI"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="TYPE_MOBILE_MMS"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="TYPE_MOBILE_SUPL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="TYPE_WIFI"
  type="int"
  transient="false"
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index a127df01b8e7..a70866de4306 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -132,7 +132,6 @@ public class ConnectivityManager
      * same as {@link #TYPEMOBILE} but it may be different.  This is used
      * by applications needing to talk to the carrier's Multimedia Messaging
      * Service servers.  It may coexist with default data connections.
-     * {@hide}
      */
     public static final int TYPE_MOBILE_MMS  = 2;
     /**
@@ -141,7 +140,6 @@ public class ConnectivityManager
      * by applications needing to talk to the carrier's Secure User Plane
      * Location servers for help locating the device.  It may coexist with
      * default data connections.
-     * {@hide}
      */
     public static final int TYPE_MOBILE_SUPL = 3;
     /**
@@ -150,7 +148,6 @@ public class ConnectivityManager
      * by applicaitons performing a Dial Up Networking bridge so that
      * the carrier is aware of DUN traffic.  It may coexist with default data
      * connections.
-     * {@hide}
      */
     public static final int TYPE_MOBILE_DUN  = 4;
     /**
@@ -158,8 +155,7 @@ public class ConnectivityManager
      * the same as {@link #TYPEMOBILE} but the routing setup is different.
      * Only requesting processes will have access to the Mobile DNS servers
      * and only IP's explicitly requested via {@link #requestRouteToHost}
-     * will route over this interface.
-     *{@hide}
+     * will route over this interface if a default route exists.
      */
     public static final int TYPE_MOBILE_HIPRI = 5;
     /** {@hide} */