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

resolved conflicts for merge of 510d0a75 to master

Browse Source 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
This commit is contained in:
Robert Greenwalt
2011-06-08 10:01:06 -07:00
parent 512b757b08 510d0a756a
commit 269d732e13
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,14 +164,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;
/** /**
@@ -207,13 +205,13 @@ 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
* will use this connection by default.
*/ */
public static final int TYPE_BLUETOOTH = 7; public static final int TYPE_BLUETOOTH = 7;
@@ -223,8 +221,8 @@ public class ConnectivityManager {
public static final int TYPE_DUMMY = 8; public static final int TYPE_DUMMY = 8;
/** /**
* Ethernet data connection. This may be via USB dongle or more * The Default Ethernet data connection. When active, all data traffic
* traditional means. * will use this connection by default.
*/ */
public static final int TYPE_ETHERNET = 9; public static final int TYPE_ETHERNET = 9;