Merge "Add some network/phone type constants."
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index 3df8ec0..40f72b2 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -315,6 +315,17 @@
case TelephonyManager.NETWORK_TYPE_EVDO_B:
networkTypeStr = "evdo";
break;
+ case TelephonyManager.NETWORK_TYPE_IDEN:
+ networkTypeStr = "iden";
+ break;
+ case TelephonyManager.NETWORK_TYPE_LTE:
+ networkTypeStr = "lte";
+ break;
+ case TelephonyManager.NETWORK_TYPE_EHRPD:
+ networkTypeStr = "ehrpd";
+ break;
+ default:
+ Log.e(TAG, "unknown network type: " + tm.getNetworkType());
}
return "net.tcp.buffersize." + networkTypeStr;
}
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index d67e6f5..44f1757 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -654,11 +654,14 @@
public static final int DATA_CONNECTION_HSPA = 10;
public static final int DATA_CONNECTION_IDEN = 11;
public static final int DATA_CONNECTION_EVDO_B = 12;
- public static final int DATA_CONNECTION_OTHER = 13;
-
+ public static final int DATA_CONNECTION_LTE = 13;
+ public static final int DATA_CONNECTION_EHRPD = 14;
+ public static final int DATA_CONNECTION_OTHER = 15;
+
static final String[] DATA_CONNECTION_NAMES = {
"none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A",
- "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "other"
+ "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte",
+ "ehrpd", "other"
};
public static final int NUM_DATA_CONNECTION_TYPES = DATA_CONNECTION_OTHER+1;
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 0f482b7..630830d 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1786,6 +1786,12 @@
case TelephonyManager.NETWORK_TYPE_EVDO_B:
bin = DATA_CONNECTION_EVDO_B;
break;
+ case TelephonyManager.NETWORK_TYPE_LTE:
+ bin = DATA_CONNECTION_LTE;
+ break;
+ case TelephonyManager.NETWORK_TYPE_EHRPD:
+ bin = DATA_CONNECTION_EHRPD;
+ break;
default:
bin = DATA_CONNECTION_OTHER;
break;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index a03a0ba..4f5c3ae 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
@@ -750,6 +750,7 @@
case TelephonyManager.NETWORK_TYPE_EVDO_B:
mDataIconList = sDataNetType_3g[mInetCondition];
break;
+ // TODO - add support for NETWORK_TYPE_LTE and NETWORK_TYPE_EHRPD
default:
mDataIconList = sDataNetType_g[mInetCondition];
break;
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 @@
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 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 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 @@
* @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 @@
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";
}