summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2010-11-02 11:10:25 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2010-11-03 17:02:37 -0700
commit962a990a45a2a9f9c3002064e71f9c2fed86acf1 (patch)
tree119af6d4371199167e8b47dcec988fddd1f167c3 /telephony/java/android
parent03476ddba607a4b1fbb7e7ad08f40f8142b20580 (diff)
downloadframeworks_base-962a990a45a2a9f9c3002064e71f9c2fed86acf1.zip
frameworks_base-962a990a45a2a9f9c3002064e71f9c2fed86acf1.tar.gz
frameworks_base-962a990a45a2a9f9c3002064e71f9c2fed86acf1.tar.bz2
Add some network/phone type constants.
Support for LTE (and SIP-based voice) and the stepping-stone eHPRD. bug:3125398 Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/NeighboringCellInfo.java2
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java19
2 files changed, 18 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java
index 2f7666d..0f9a3b9 100644
--- a/telephony/java/android/telephony/NeighboringCellInfo.java
+++ b/telephony/java/android/telephony/NeighboringCellInfo.java
@@ -127,7 +127,7 @@ public class NeighboringCellInfo implements Parcelable
location = "0" + location;
}
}
-
+ // TODO - handle LTE and eHRPD (or find they can't be supported)
try {// set LAC/CID or PSC based on radioType
switch (radioType) {
case NETWORK_TYPE_GPRS:
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 2370add..1cd3679 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -272,13 +272,17 @@ public class TelephonyManager {
public static final int PHONE_TYPE_GSM = Phone.PHONE_TYPE_GSM;
/** Phone radio is CDMA. */
public static final int PHONE_TYPE_CDMA = Phone.PHONE_TYPE_CDMA;
+ /** Phone is via SIP. */
+ public static final int PHONE_TYPE_SIP = Phone.PHONE_TYPE_SIP;
/**
- * Returns a constant indicating the device phone type.
+ * Returns a constant indicating the device phone type. This
+ * indicates the type of radio used to transmit voice calls.
*
* @see #PHONE_TYPE_NONE
* @see #PHONE_TYPE_GSM
* @see #PHONE_TYPE_CDMA
+ * @see #PHONE_TYPE_SIP
*/
public int getPhoneType() {
try{
@@ -393,11 +397,15 @@ 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;
+ /** Current network is LTE */
+ public static final int NETWORK_TYPE_LTE = 13;
+ /** 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.
+ * currently in use on the device for data transmission.
* @return the network type
*
* @see #NETWORK_TYPE_UNKNOWN
@@ -412,6 +420,9 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_EVDO_A
* @see #NETWORK_TYPE_EVDO_B
* @see #NETWORK_TYPE_1xRTT
+ * @see #NETWORK_TYPE_IDEN
+ * @see #NETWORK_TYPE_LTE
+ * @see #NETWORK_TYPE_EHRPD
*/
public int getNetworkType() {
try{
@@ -462,6 +473,10 @@ public class TelephonyManager {
return "CDMA - EvDo rev. B";
case NETWORK_TYPE_1xRTT:
return "CDMA - 1xRTT";
+ case NETWORK_TYPE_LTE:
+ return "LTE";
+ case NETWORK_TYPE_EHRPD:
+ return "CDMA - eHRPD";
default:
return "UNKNOWN";
}