diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-29 09:35:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 09:35:28 -0800 |
| commit | b46062bc0886eb176afe23b7dab81db3ab6c1beb (patch) | |
| tree | 918b40e671a8a72bc11e305361df875f8a2b8982 /core/java/android/net | |
| parent | f8f37d97ce108e12dd973de941de5185df500a9d (diff) | |
| parent | f8fdec50c7871b640c13cfe3e2e7a3b449f62f69 (diff) | |
| download | frameworks_base-b46062bc0886eb176afe23b7dab81db3ab6c1beb.zip frameworks_base-b46062bc0886eb176afe23b7dab81db3ab6c1beb.tar.gz frameworks_base-b46062bc0886eb176afe23b7dab81db3ab6c1beb.tar.bz2 | |
am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
Add some network types that OEM's are asking for.
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 7e809f5..cab8ed2 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -221,6 +221,8 @@ public class ConnectivityManager /** {@hide} */ public static final int TYPE_DUMMY = 8; + /** {@hide} */ + public static final int TYPE_ETHERNET = 9; /** {@hide} TODO: Need to adjust this for WiMAX. */ public static final int MAX_RADIO_TYPE = TYPE_DUMMY; /** {@hide} TODO: Need to adjust this for WiMAX. */ |