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

* commit '996d60e3a5abe29479b741bd1b346977e4c101aa':
  Add some network types that OEM's are asking for.
This commit is contained in:
Robert Greenwalt
2011-01-29 09:35:28 -08:00
committed by Android Git Automerger

View File

@@ -221,6 +221,8 @@ public class ConnectivityManager
/** {@hide} */ /** {@hide} */
public static final int TYPE_DUMMY = 8; public static final int TYPE_DUMMY = 8;
/** {@hide} */
public static final int TYPE_ETHERNET = 9;
/** {@hide} TODO: Need to adjust this for WiMAX. */ /** {@hide} TODO: Need to adjust this for WiMAX. */
public static final int MAX_RADIO_TYPE = TYPE_DUMMY; public static final int MAX_RADIO_TYPE = TYPE_DUMMY;
/** {@hide} TODO: Need to adjust this for WiMAX. */ /** {@hide} TODO: Need to adjust this for WiMAX. */