Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN... (389bf4f7) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+4 −24

Original line number	Diff line number	Diff line
		@@ -221,32 +221,12 @@ public class ConnectivityManager

		/** {@hide} */
		public static final int TYPE_DUMMY = 8;

		/** {@hide} */
		public static final int TYPE_ETHERNET = 9;
		/**
		* Over the air Adminstration.
		* {@hide}
		*/
		public static final int TYPE_MOBILE_FOTA = 10;

		/**
		* IP Multimedia Subsystem
		* {@hide}
		*/
		public static final int TYPE_MOBILE_IMS = 11;

		/**
		* Carrier Branded Services
		* {@hide}
		*/
		public static final int TYPE_MOBILE_CBS = 12;

		/** {@hide} */
		public static final int MAX_RADIO_TYPE = TYPE_MOBILE_CBS;

		/** {@hide} */
		public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_CBS;
		/** {@hide} TODO: Need to adjust this for WiMAX. */
		public static final int MAX_RADIO_TYPE = TYPE_DUMMY;
		/** {@hide} TODO: Need to adjust this for WiMAX. */
		public static final int MAX_NETWORK_TYPE = TYPE_DUMMY;

		public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI;

+1 −8

Original line number	Diff line number	Diff line
		@@ -437,8 +437,7 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		retValue = true;
		break;
		case Phone.APN_REQUEST_STARTED:
		// set IDLE here , avoid the following second FAILED not sent out
		mNetworkInfo.setDetailedState(DetailedState.IDLE, null, null);
		// no need to do anything - we're already due some status update intents
		retValue = true;
		break;
		case Phone.APN_REQUEST_FAILED:
		@@ -547,12 +546,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		return Phone.APN_TYPE_DUN;
		case ConnectivityManager.TYPE_MOBILE_HIPRI:
		return Phone.APN_TYPE_HIPRI;
		case ConnectivityManager.TYPE_MOBILE_FOTA:
		return Phone.APN_TYPE_FOTA;
		case ConnectivityManager.TYPE_MOBILE_IMS:
		return Phone.APN_TYPE_IMS;
		case ConnectivityManager.TYPE_MOBILE_CBS:
		return Phone.APN_TYPE_CBS;
		default:
		sloge("Error mapping networkType " + netType + " to apnType.");
		return null;

+0 −8

Original line number	Diff line number	Diff line
		@@ -1723,14 +1723,6 @@ public final class Telephony {

		public static final String TYPE = "type";

		public static final String INACTIVE_TIMER = "inactivetimer";

		// Only if enabled try Data Connection.
		public static final String ENABLED = "enabled";

		// Rules apply based on class.
		public static final String CLASS = "class";

		/**
		* The protocol to be used to connect to this APN.
		*

+0 −8

Original line number	Diff line number	Diff line
		@@ -52,11 +52,6 @@
		strictly needed. -->
		<bool name="config_sf_limitedAlpha">false</bool>

		<!-- Default value used to block data calls if ims is not
		connected. If you use the ims apn DCT will block
		any other apn from connecting until ims apn is connected-->
		<bool name="ImsConnectedDefaultValue">false</bool>

		<!-- Flag indicating whether the surface flinger is inefficient
		at performing a blur. Used by parts of the UI to turn off
		the blur effect where it isn't worth the performance hit. -->
		@@ -138,9 +133,6 @@
		<item>"mobile_mms,2,0,2"</item>
		<item>"mobile_supl,3,0,2"</item>
		<item>"mobile_hipri,5,0,3"</item>
		<item>"mobile_fota,8,0,2"</item>
		<item>"mobile_ims,9,0,2"</item>
		<item>"mobile_cbs,10,0,2"</item>
		</string-array>

		<!-- This string array should be overridden by the device to present a list of radio

deleted100644 → 0

−258 B

Loading image diff...