Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

Browse Source 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
This commit is contained in:
Robert Greenwalt
2011-01-29 09:32:04 -08:00
parent a0e51ef2a4 aa3866e6fa
commit f8fdec50c7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/ConnectivityManager.java
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. */

1
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -402,7 +402,6 @@ public class TelephonyManager {
/** Current network is eHRPD */ /** Current network is eHRPD */
public static final int NETWORK_TYPE_EHRPD = 14; public static final int NETWORK_TYPE_EHRPD = 14;
/** /**
* Returns a constant indicating the radio technology (network type) * Returns a constant indicating the radio technology (network type)
* currently in use on the device for data transmission. * currently in use on the device for data transmission.