joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

am f17deff9: resolved conflicts for merge of 8de47a2f to honeycomb-LTE

Browse source 
* commit 'f17deff97b':
  Reveal some network constants.
This commit is contained in:
Robert Greenwalt 2011-06-07 13:12:29 -07:00 • committed by Android Git Automerger
commit 510d0a756a
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
* 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;
/**
@ -208,21 +206,23 @@ 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.
* @hide
* The Default Bluetooth data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_BLUETOOTH = 7;
/** {@hide} */
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;
/**
* Over the air Adminstration.