diff options
| author | John Wang <johnwang@google.com> | 2009-09-25 14:32:18 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-11-03 16:02:24 -0800 |
| commit | ef079601f467310a3aa0916ac621dd8b5c2b0ffe (patch) | |
| tree | 13a6b7b0c1e69fcf4975b7255fe9e0a8e55f6f1a | |
| parent | 73ddd08ecd6fab13d7029795bbd8b16db6e836dc (diff) | |
| download | base-ef079601f467310a3aa0916ac621dd8b5c2b0ffe.tar.gz | |
Unhide NETWORK_TYPE_XXX. (do not merge)
Make NETWORK_TYPE_HSDPA etc. unhide in TelephonyManager.
(integrated from eclair)
| -rw-r--r-- | api/current.xml | 44 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 7 |
2 files changed, 46 insertions, 5 deletions
diff --git a/api/current.xml b/api/current.xml index c5e71aab862c..1614e221c04b 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" diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 3c6a1e929b65..1c510089b601 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -372,15 +372,12 @@ 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; /** |