commit f2b39b4773e7af57bb95f1344d4da3ea55c5ccfb
author Robert Greenwalt <rgreenwalt@google.com> Sat Jan 29 09:35:28 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 29 09:35:28 2011 -0800
tree a8a2a69ccc36c4ce3918f7f4dea7043d3f8d0d65
parent 52ef39aff1c6ea0c39bd5fab2f727656e635a224
parent 996d60e3a5abe29479b741bd1b346977e4c101aa

am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp

* commit '996d60e3a5abe29479b741bd1b346977e4c101aa':
  Add some network types that OEM's are asking for.

core/java/android/net/ConnectivityManager.java

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. */