diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:00:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 12:00:37 -0700 |
| commit | 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb (patch) | |
| tree | 8a990de907e1f501bef95ac916fbb50070c28ff2 /core/java/android/net | |
| parent | a476813dccec241632810c1cbb11bcfbf17841b0 (diff) | |
| parent | 97ab2d4f86ee9c2b661a00688e934fc7030df22e (diff) | |
| download | frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.zip frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.tar.gz frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.tar.bz2 | |
Merge "Reveal some network constants." into honeycomb-mr2
Diffstat (limited to 'core/java/android/net')
| -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 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; |