diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-29 06:55:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 06:55:38 -0800 |
| commit | aa3866e6fa2d0c0e026b78cf43dccce67a2021e5 (patch) | |
| tree | 7743ee10aedc5589dd261228ef59342bab2a403e | |
| parent | 287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4 (diff) | |
| parent | 6b739dc7292452227cdd8abd90658f4db8f0ce70 (diff) | |
| download | frameworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.zip frameworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.tar.gz frameworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.tar.bz2 | |
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 9 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1cfe419..a43914a 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -212,6 +212,15 @@ public class ConnectivityManager * default connections. */ public static final int TYPE_WIMAX = 6; + /** + * Bluetooth data connection. + * @hide + */ + public static final int TYPE_BLUETOOTH = 7; + /** {@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_WIFI; /** {@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 27e08d4..69673b1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -393,7 +393,10 @@ public class TelephonyManager { public static final int NETWORK_TYPE_IDEN = 11; /** Current network is EVDO revision B*/ public static final int NETWORK_TYPE_EVDO_B = 12; - + /** @hide */ + public static final int NETWORK_TYPE_LTE = 13; + /** @hide */ + public static final int NETWORK_TYPE_EHRPD = 14; /** * Returns a constant indicating the radio technology (network type) |