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 am: 269d732e13

Browse Source 
Original change: undetermined

Change-Id: I2b375d78a0e375a14f89133f7239c0643d5378d8
This commit is contained in:
Robert Greenwalt
2021-05-31 11:23:58 +00:00
committed by Automerger Merge Worker
parent c7a2cbdaf7 269d732e13
commit 6a6fe42af8
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
* will use this connection by default. Should not coexist with other
* default connections.
* will use this connection by default.
*/
public static final int TYPE_MOBILE = 0;
/**
* The Default WIFI data connection. When active, all data traffic
* will use this connection by default. Should not coexist with other
* default connections.
* will use this connection by default.
*/
public static final int TYPE_WIFI = 1;
/**
@@ -207,13 +205,13 @@ public class ConnectivityManager {
public static final int TYPE_MOBILE_HIPRI = 5;
/**
* The Default WiMAX data connection. When active, all data traffic
* will use this connection by default. Should not coexist with other
* default connections.
* will use this connection by default.
*/
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;
@@ -223,8 +221,8 @@ public class ConnectivityManager {
public static final int TYPE_DUMMY = 8;
/**
* Ethernet data connection. This may be via USB dongle or more
* traditional means.
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_ETHERNET = 9;