Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fb2b04b7: Unhide NETWORK_TYPE_XXX.

Browse Source 
Merge commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9' into eclair-plus-aosp

* commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9':
  Unhide NETWORK_TYPE_XXX.
This commit is contained in:
John Wang
2009-09-25 15:00:07 -07:00
committed by Android Git Automerger
parent 08fc1b507c fb2b04b7bc
commit 53e501cfb3
2 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
api/current.xml
View File

@@ -125237,6 +125237,28 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="NETWORK_TYPE_EDGE"
type="int" type="int"
transient="false" transient="false"
@@ -125248,6 +125270,28 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="NETWORK_TYPE_GPRS"
type="int" type="int"
transient="false" transient="false"
@@ -125259,6 +125303,39 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="NETWORK_TYPE_UMTS"
type="int" type="int"
transient="false" transient="false"

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -373,24 +373,18 @@ public class TelephonyManager {
/** Current network is UMTS */ /** Current network is UMTS */
public static final int NETWORK_TYPE_UMTS = 3; public static final int NETWORK_TYPE_UMTS = 3;
/** Current network is CDMA: Either IS95A or IS95B*/ /** Current network is CDMA: Either IS95A or IS95B*/
/** @hide */
public static final int NETWORK_TYPE_CDMA = 4; public static final int NETWORK_TYPE_CDMA = 4;
/** Current network is EVDO revision 0 or revision A*/ /** Current network is EVDO revision 0*/
/** @hide */
public static final int NETWORK_TYPE_EVDO_0 = 5; 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; public static final int NETWORK_TYPE_EVDO_A = 6;
/** Current network is 1xRTT*/ /** Current network is 1xRTT*/
/** @hide */
public static final int NETWORK_TYPE_1xRTT = 7; public static final int NETWORK_TYPE_1xRTT = 7;
/** Current network is HSDPA */ /** Current network is HSDPA */
/** @hide */
public static final int NETWORK_TYPE_HSDPA = 8; public static final int NETWORK_TYPE_HSDPA = 8;
/** Current network is HSUPA */ /** Current network is HSUPA */
/** @hide */
public static final int NETWORK_TYPE_HSUPA = 9; public static final int NETWORK_TYPE_HSUPA = 9;
/** Current network is HSPA */ /** Current network is HSPA */
/** @hide */
public static final int NETWORK_TYPE_HSPA = 10; public static final int NETWORK_TYPE_HSPA = 10;
/** /**