Merge 6b739dc7 from gingerbread

Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:11 -08:00
parent 4e723420e0 9d07781cb6
commit d97edba7d1
1 changed files with 2 additions and 0 deletions
--- 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. */