diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 12:59:11 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 12:59:20 -0800 |
| commit | 7ea919c44b05daf99c045d09eb3edafb96019da7 (patch) | |
| tree | 22f0f16e78529bcf11773b4f22a37fbcd458a4d6 | |
| parent | 5f3ba16de02de7e36b11117d455e1c64e231cd3f (diff) | |
| parent | 6b739dc7292452227cdd8abd90658f4db8f0ce70 (diff) | |
| download | frameworks_base-7ea919c44b05daf99c045d09eb3edafb96019da7.zip frameworks_base-7ea919c44b05daf99c045d09eb3edafb96019da7.tar.gz frameworks_base-7ea919c44b05daf99c045d09eb3edafb96019da7.tar.bz2 | |
Merge 6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
2 files changed, 2 insertions, 1 deletions
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 @@ 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. */ diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4424e5b..88d9436 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -402,7 +402,6 @@ public class TelephonyManager { /** Current network is eHRPD */ public static final int NETWORK_TYPE_EHRPD = 14; - /** * Returns a constant indicating the radio technology (network type) * currently in use on the device for data transmission. |