am bef17491: am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.

Merge commit 'bef17491488a297c8f6587bd37e333cbb8cf0ce4' into eclair-mr2-plus-aosp

* commit 'bef17491488a297c8f6587bd37e333cbb8cf0ce4':
  New API 4 with new CDMA constants.
This commit is contained in:
Xavier Ducrohet
2009-11-06 10:17:45 -08:00
committed by Android Git Automerger

View File

@@ -111799,6 +111799,17 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="DATA_ACTIVITY_DORMANT"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DATA_ACTIVITY_IN" <field name="DATA_ACTIVITY_IN"
type="int" type="int"
transient="false" transient="false"
@@ -111939,6 +111950,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"
@@ -111950,6 +111983,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"
@@ -111983,6 +112038,17 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="PHONE_TYPE_CDMA"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="PHONE_TYPE_GSM" <field name="PHONE_TYPE_GSM"
type="int" type="int"
transient="false" transient="false"