From fb2b04b7bc505f5e600e360a9de6f63e16c21bf9 Mon Sep 17 00:00:00 2001
From: John Wang <johnwang@google.com>
Date: Fri, 25 Sep 2009 14:32:18 -0700
Subject: [PATCH] Unhide NETWORK_TYPE_XXX.

Make NETWORK_TYPE_HSDPA etc. unhide in TelephonyManager.
---
 api/current.xml                               | 77 +++++++++++++++++++
 .../android/telephony/TelephonyManager.java   | 10 +--
 2 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 37fb3a8bace12..3612104e53f0f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -125237,6 +125237,28 @@
  visibility="public"
 >
 </field>
+<field name="NETWORK_TYPE_1xRTT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NETWORK_TYPE_CDMA"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="NETWORK_TYPE_EDGE"
  type="int"
  transient="false"
@@ -125248,6 +125270,28 @@
  visibility="public"
 >
 </field>
+<field name="NETWORK_TYPE_EVDO_0"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NETWORK_TYPE_EVDO_A"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="NETWORK_TYPE_GPRS"
  type="int"
  transient="false"
@@ -125259,6 +125303,39 @@
  visibility="public"
 >
 </field>
+<field name="NETWORK_TYPE_HSDPA"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NETWORK_TYPE_HSPA"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="10"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NETWORK_TYPE_HSUPA"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="NETWORK_TYPE_UMTS"
  type="int"
  transient="false"
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index fb96b2aee5b8c..a53b15740cc57 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -373,24 +373,18 @@ public class TelephonyManager {
     /** Current network is UMTS */
     public static final int NETWORK_TYPE_UMTS = 3;
     /** Current network is CDMA: Either IS95A or IS95B*/
-    /** @hide */
     public static final int NETWORK_TYPE_CDMA = 4;
-    /** Current network is EVDO revision 0 or revision A*/
-    /** @hide */
+    /** Current network is EVDO revision 0*/
     public static final int NETWORK_TYPE_EVDO_0 = 5;
-    /** @hide */
+    /** Current network is EVDO revision A*/
     public static final int NETWORK_TYPE_EVDO_A = 6;
     /** Current network is 1xRTT*/
-    /** @hide */
     public static final int NETWORK_TYPE_1xRTT = 7;
     /** Current network is HSDPA */
-    /** @hide */
     public static final int NETWORK_TYPE_HSDPA = 8;
     /** Current network is HSUPA */
-    /** @hide */
     public static final int NETWORK_TYPE_HSUPA = 9;
     /** Current network is HSPA */
-    /** @hide */
     public static final int NETWORK_TYPE_HSPA = 10;
 
     /**