Merge "Add definitions for WiMAX and iDen network types."

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"

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;

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)