diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:45:41 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:45:41 -0700 |
| commit | 5df69fad6e5021d2862bff0553a510f8d6729fbd (patch) | |
| tree | 61eab9273e80276b65498c6f1f987574ff75b62d /core/java/android/net/ConnectivityManager.java | |
| parent | 212d15c746f2611339026c16e5fa1aeb7f9090b7 (diff) | |
| parent | 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb (diff) | |
| download | frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.zip frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.tar.gz frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.tar.bz2 | |
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index b541ec3..eaf9191 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,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. |