summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-05-27 11:29:13 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2011-05-31 12:06:08 -0700
commit97ab2d4f86ee9c2b661a00688e934fc7030df22e (patch)
treee53c13809f23bff012597319eb8c8f0a0ecb258d /core
parent4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e (diff)
downloadframeworks_base-97ab2d4f86ee9c2b661a00688e934fc7030df22e.zip
frameworks_base-97ab2d4f86ee9c2b661a00688e934fc7030df22e.tar.gz
frameworks_base-97ab2d4f86ee9c2b661a00688e934fc7030df22e.tar.bz2
Reveal some network constants.
Since we've already decided to inc the sdk version we should try to get these in too. bug:4500218 Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
Diffstat (limited to 'core')
-rw-r--r--core/java/android/net/ConnectivityManager.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 491c73a..b305e02 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -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,20 +206,22 @@ 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;
/** {@hide} TODO: Need to adjust this for WiMAX. */
public static final int MAX_RADIO_TYPE = TYPE_ETHERNET;