diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-11-06 10:08:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 10:08:03 -0800 |
| commit | bef17491488a297c8f6587bd37e333cbb8cf0ce4 (patch) | |
| tree | 81c74bc2be7199ec56307186ac67ad6514a4e135 | |
| parent | be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5 (diff) | |
| parent | 9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed (diff) | |
| download | frameworks_base-bef17491488a297c8f6587bd37e333cbb8cf0ce4.zip frameworks_base-bef17491488a297c8f6587bd37e333cbb8cf0ce4.tar.gz frameworks_base-bef17491488a297c8f6587bd37e333cbb8cf0ce4.tar.bz2 | |
am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.
Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2
* commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
New API 4 with new CDMA constants.
| -rw-r--r-- | api/4.xml | 66 |
1 files changed, 66 insertions, 0 deletions
@@ -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" |