LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 8de47a2f to honeycomb-LTE

Browse Source 
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
This commit is contained in:
Robert Greenwalt
2011-06-07 12:45:41 -07:00
parent e1544bb9ea 6a9d45449d
commit f17deff97b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,14 +165,12 @@ public class ConnectivityManager
/** /**
* The Default Mobile data connection. When active, all data traffic * The Default Mobile data connection. When active, all data traffic
* will use this connection by default. Should not coexist with other * will use this connection by default.
* default connections.
*/ */
public static final int TYPE_MOBILE = 0; public static final int TYPE_MOBILE = 0;
/** /**
* The Default WIFI data connection. When active, all data traffic * The Default WIFI data connection. When active, all data traffic
* will use this connection by default. Should not coexist with other * will use this connection by default.
* default connections.
*/ */
public static final int TYPE_WIFI = 1; public static final int TYPE_WIFI = 1;
/** /**
@@ -208,21 +206,23 @@ public class ConnectivityManager
public static final int TYPE_MOBILE_HIPRI = 5; public static final int TYPE_MOBILE_HIPRI = 5;
/** /**
* The Default WiMAX data connection. When active, all data traffic * The Default WiMAX data connection. When active, all data traffic
* will use this connection by default. Should not coexist with other * will use this connection by default.
* default connections.
*/ */
public static final int TYPE_WIMAX = 6; public static final int TYPE_WIMAX = 6;
/** /**
* Bluetooth data connection. This is used for Bluetooth reverse tethering. * The Default Bluetooth data connection. When active, all data traffic
* @hide * will use this connection by default.
*/ */
public static final int TYPE_BLUETOOTH = 7; public static final int TYPE_BLUETOOTH = 7;
/** {@hide} */ /** {@hide} */
public static final int TYPE_DUMMY = 8; public static final int TYPE_DUMMY = 8;
/** {@hide} */ /**
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_ETHERNET = 9; public static final int TYPE_ETHERNET = 9;
/** /**
* Over the air Adminstration. * Over the air Adminstration.