commit ef079601f467310a3aa0916ac621dd8b5c2b0ffe
author John Wang <johnwang@google.com> Fri Sep 25 14:32:18 2009 -0700
committer Xavier Ducrohet <xav@android.com> Tue Nov 03 16:02:24 2009 -0800
tree 13a6b7b0c1e69fcf4975b7255fe9e0a8e55f6f1a
parent 73ddd08ecd6fab13d7029795bbd8b16db6e836dc

Unhide NETWORK_TYPE_XXX. (do not merge)

Make NETWORK_TYPE_HSDPA etc. unhide in TelephonyManager.

(integrated from eclair)

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index c5e71aa..1614e22 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -111950,6 +111950,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"
@@ -111961,6 +111983,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"

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 3c6a1e9..1c51008 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -372,15 +372,12 @@
     /** 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;
 
     /**