diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-25 15:05:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-25 15:05:24 -0700 |
| commit | 7ada57f8baa14740a2484e5f04a78e63a872d8a8 (patch) | |
| tree | 2d486190824a9cbb57ff7c6fca4f61199eaca062 /core/java | |
| parent | 1a2210ced1434924f2b459486bfe95c80f5323e7 (diff) | |
| parent | 6081084e8831d12d2dd5a9a340ee7d35a54edb8a (diff) | |
| download | frameworks_base-7ada57f8baa14740a2484e5f04a78e63a872d8a8.zip frameworks_base-7ada57f8baa14740a2484e5f04a78e63a872d8a8.tar.gz frameworks_base-7ada57f8baa14740a2484e5f04a78e63a872d8a8.tar.bz2 | |
Merge "Expose more net types to the public."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index b541ec3..419288b 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -215,15 +215,20 @@ public class ConnectivityManager /** * Bluetooth data connection. This is used for Bluetooth reverse tethering. - * @hide */ public static final int TYPE_BLUETOOTH = 7; - /** {@hide} */ + /** + * Dummy data connection. This should not be used on shipping devices. + */ public static final int TYPE_DUMMY = 8; - /** {@hide} */ + /** + * Ethernet data connection. This may be via USB dongle or more + * traditional means. + */ public static final int TYPE_ETHERNET = 9; + /** * Over the air Adminstration. * {@hide} |