diff options
| author | jsh <jsh@google.com> | 2010-03-11 15:04:43 -0800 |
|---|---|---|
| committer | jsh <jsh@google.com> | 2010-03-15 15:31:08 -0700 |
| commit | 8214deb542392f48b6c3fdc377fdf976c0b17a32 (patch) | |
| tree | 4a6d0fabd7ef0990979609c165b86a0eadfa9122 | |
| parent | 4f096dcf6ae068a144b8044cf55ba886823e66d3 (diff) | |
| download | frameworks_base-8214deb542392f48b6c3fdc377fdf976c0b17a32.zip frameworks_base-8214deb542392f48b6c3fdc377fdf976c0b17a32.tar.gz frameworks_base-8214deb542392f48b6c3fdc377fdf976c0b17a32.tar.bz2 | |
Add definitions for WiMAX and iDen network types.
b/2509185
Change-Id: Icf07ce857874e200712218713edbdbb47e646297
| -rw-r--r-- | api/current.xml | 22 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 10 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
3 files changed, 32 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 701586e..e6f3788 100644 --- a/api/current.xml +++ b/api/current.xml @@ -87668,6 +87668,17 @@ visibility="public" > </field> +<field name="TYPE_WIMAX" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Credentials" extends="java.lang.Object" @@ -143010,6 +143021,17 @@ visibility="public" > </field> +<field name="NETWORK_TYPE_IDEN" + type="int" + transient="false" + volatile="false" + value="11" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="NETWORK_TYPE_UMTS" type="int" transient="false" diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index a6668e7..280ded6 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -184,9 +184,15 @@ public class ConnectivityManager * will route over this interface if a default route exists. */ public static final int TYPE_MOBILE_HIPRI = 5; - /** {@hide} */ + /** + * The Default WiMAX data connection. When active, all data traffic + * will use this connection by default. Should not coexist with other + * default connections. + */ + public static final int TYPE_WIMAX = 6; + /** {@hide} TODO: Need to adjust this for WiMAX. */ public static final int MAX_RADIO_TYPE = TYPE_WIFI; - /** {@hide} */ + /** {@hide} TODO: Need to adjust this for WiMAX. */ public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_HIPRI; public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a6b1d93..ae5b1de 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -389,6 +389,8 @@ public class TelephonyManager { public static final int NETWORK_TYPE_HSUPA = 9; /** Current network is HSPA */ public static final int NETWORK_TYPE_HSPA = 10; + /** Current network is iDen */ + public static final int NETWORK_TYPE_IDEN = 11; /** * Returns a constant indicating the radio technology (network type) |