| commit | abcb4fecfce3285779c9f323a8652398ab75e881 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Jan 30 12:40:32 2011 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Sun Jan 30 12:40:38 2011 -0800 |
| tree | a05927daa315c5338b5424e1916c5a98272f9a13 | |
| parent | 72a95b97e976f53f77cb6c974e5574d807f62f2f [diff] | |
| parent | d97edba7d10cf0b6fdd3016028aa2139d81e1c3b [diff] |
Mass merge from gingerbread - do not merge Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
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 @@ /** {@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. */