am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master (381b5586) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -147235,6 +147235,17 @@
		visibility="public"
		>
		</field>
		<field name="NETWORK_TYPE_EVDO_B"
		type="int"
		transient="false"
		volatile="false"
		value="12"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NETWORK_TYPE_GPRS"
		type="int"
		transient="false"

+3 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		networkTypeStr = "evdo";
		break;
		case TelephonyManager.NETWORK_TYPE_EVDO_B:
		networkTypeStr = "evdo";
		break;
		}
		return "net.tcp.buffersize." + networkTypeStr;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -954,7 +954,9 @@ public class StatusBarPolicy {
		&& ((mServiceState.getRadioTechnology()
		== ServiceState.RADIO_TECHNOLOGY_EVDO_0)
		\|\| (mServiceState.getRadioTechnology()
		== ServiceState.RADIO_TECHNOLOGY_EVDO_A)));
		== ServiceState.RADIO_TECHNOLOGY_EVDO_A)
		\|\| (mServiceState.getRadioTechnology()
		== ServiceState.RADIO_TECHNOLOGY_EVDO_B)));
		}

		private boolean hasService() {
		@@ -1070,7 +1072,6 @@ public class StatusBarPolicy {
		}

		private final void updateDataNetType(int net) {

		switch (net) {
		case TelephonyManager.NETWORK_TYPE_EDGE:
		mDataIconList = sDataNetType_e;
		@@ -1096,6 +1097,7 @@ public class StatusBarPolicy {
		break;
		case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		case TelephonyManager.NETWORK_TYPE_EVDO_B:
		mDataIconList = sDataNetType_3g;
		break;
		default:

+5 −1

Original line number	Diff line number	Diff line
		@@ -89,6 +89,8 @@ public class ServiceState implements Parcelable {
		public static final int RADIO_TECHNOLOGY_HSUPA = 10;
		/** @hide */
		public static final int RADIO_TECHNOLOGY_HSPA = 11;
		/** @hide */
		public static final int RADIO_TECHNOLOGY_EVDO_B = 12;

		/**
		* Available registration states for GSM, UMTS and CDMA.
		@@ -379,7 +381,6 @@ public class ServiceState implements Parcelable {
		@Override
		public String toString() {
		String radioTechnology = new String("Error in radioTechnology");

		switch(this.mRadioTechnology) {
		case 0:
		radioTechnology = "Unknown";
		@@ -417,6 +418,9 @@ public class ServiceState implements Parcelable {
		case 11:
		radioTechnology = "HSPA";
		break;
		case 12:
		radioTechnology = "EvDo rev. B";
		break;
		default:
		Log.w(LOG_TAG, "mRadioTechnology variable out of range.");
		break;

+6 −0

Original line number	Diff line number	Diff line
		@@ -391,6 +391,9 @@ public class TelephonyManager {
		public static final int NETWORK_TYPE_HSPA = 10;
		/** Current network is iDen */
		public static final int NETWORK_TYPE_IDEN = 11;
		/** Current network is EVDO revision B*/
		public static final int NETWORK_TYPE_EVDO_B = 12;


		/**
		* Returns a constant indicating the radio technology (network type)
		@@ -407,6 +410,7 @@ public class TelephonyManager {
		* @see #NETWORK_TYPE_CDMA
		* @see #NETWORK_TYPE_EVDO_0
		* @see #NETWORK_TYPE_EVDO_A
		* @see #NETWORK_TYPE_EVDO_B
		* @see #NETWORK_TYPE_1xRTT
		*/
		public int getNetworkType() {
		@@ -454,6 +458,8 @@ public class TelephonyManager {
		return "CDMA - EvDo rev. 0";
		case NETWORK_TYPE_EVDO_A:
		return "CDMA - EvDo rev. A";
		case NETWORK_TYPE_EVDO_B:
		return "CDMA - EvDo rev. B";
		case NETWORK_TYPE_1xRTT:
		return "CDMA - 1xRTT";
		default: