Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bef17491 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

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

Merge commit '9eaff61a' into eclair-mr2

* commit '9eaff61a':
  New API 4 with new CDMA constants.
parents be364022 9eaff61a

api/4.xml

+66 −0
Original line number Diff line number Diff line
@@ -111799,6 +111799,17 @@ 
 visibility="public"

>

</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"

 type="int"

 transient="false"
@@ -111939,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"
@@ -111950,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"
@@ -111983,6 +112038,17 @@ 
 visibility="public"

>

</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"

 type="int"

 transient="false"