summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-01-28 14:48:37 -0800
committerRobert Greenwalt <rgreenwalt@google.com>2011-01-28 14:48:37 -0800
commite12aec941dfc93b76b5efb9bc9f30d2ba3469434 (patch)
treedf0c00866cae42d820a9e80a5d8eef42035bf3d4
parentfa809dba8ec7f894bd53dba8e1cf742082c5cb3e (diff)
downloadbase-e12aec941dfc93b76b5efb9bc9f30d2ba3469434.tar.gz
Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can use the same values. Will mark them unhidden in a future sdk release. bug:3395729 Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
-rw-r--r--core/java/android/net/ConnectivityManager.java9
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java5
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 39681912dec3..711c6cd012d6 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -209,6 +209,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 27e08d490f45..69673b1e357a 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)