Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add some network types that OEM's are asking for." into gingerbread

Browse Source
This commit is contained in:
Robert Greenwalt
2011-01-29 06:38:35 -08:00
committed by Android (Google) Code Review
parent 5f2def8cfd e12aec941d
commit 6b739dc729
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/ConnectivityManager.java
View File

@@ -209,6 +209,15 @@ public class ConnectivityManager
* default connections. * default connections.
*/ */
public static final int TYPE_WIMAX = 6; public static final int TYPE_WIMAX = 6;
/**
* Bluetooth data connection.
* @hide
*/
public static final int TYPE_BLUETOOTH = 7;
/** {@hide} */
public static final int TYPE_DUMMY = 8;
/** {@hide} */
public static final int TYPE_ETHERNET = 9;
/** {@hide} TODO: Need to adjust this for WiMAX. */ /** {@hide} TODO: Need to adjust this for WiMAX. */
public static final int MAX_RADIO_TYPE = TYPE_WIFI; public static final int MAX_RADIO_TYPE = TYPE_WIFI;
/** {@hide} TODO: Need to adjust this for WiMAX. */ /** {@hide} TODO: Need to adjust this for WiMAX. */

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -393,7 +393,10 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_IDEN = 11; public static final int NETWORK_TYPE_IDEN = 11;
/** Current network is EVDO revision B*/ /** Current network is EVDO revision B*/
public static final int NETWORK_TYPE_EVDO_B = 12; public static final int NETWORK_TYPE_EVDO_B = 12;
/** @hide */
public static final int NETWORK_TYPE_LTE = 13;
/** @hide */
public static final int NETWORK_TYPE_EHRPD = 14;
/** /**
* Returns a constant indicating the radio technology (network type) * Returns a constant indicating the radio technology (network type)