MSIM: Enable data+mms (7d56317c) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcSwitchStateMachine.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -25,8 +25,10 @@ import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.PhoneBase;
		import com.android.internal.telephony.PhoneProxy;
		import com.android.internal.telephony.dataconnection.DcSwitchAsyncChannel.RequestInfo;
		import com.android.internal.telephony.SubscriptionController;

		import android.os.Message;
		import android.os.SystemProperties;
		import android.telephony.Rlog;

		public class DcSwitchStateMachine extends StateMachine {
		@@ -95,6 +97,18 @@ public class DcSwitchStateMachine extends StateMachine {

		PhoneBase pb = (PhoneBase)((PhoneProxy)mPhone).getActivePhone();
		pb.mCi.setDataAllowed(true, null);
		boolean isPrimarySubFeatureEnable =
		SystemProperties.getBoolean("persist.radio.primarycard", false);
		int subId = pb.getSubId();
		log("Setting default DDS on " + subId + " primary Sub feature"
		+ isPrimarySubFeatureEnable);
		// When isPrimarySubFeatureEnable is enabled apps will take care
		// of sending DDS request during device power-up.
		if (!isPrimarySubFeatureEnable) {
		SubscriptionController subscriptionController
		= SubscriptionController.getInstance();
		subscriptionController.setDefaultDataSubId(subId);
		}

		mAc.replyToMessage(msg, DcSwitchAsyncChannel.RSP_CONNECT,
		PhoneConstants.APN_REQUEST_STARTED);

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+3 −242

Original line number	Diff line number	Diff line
		@@ -142,8 +142,6 @@ public final class DcTracker extends DcTrackerBase {

		private static final int PROVISIONING_SPINNER_TIMEOUT_MILLIS = 120 * 1000;

		static final Uri PREFERAPN_NO_UPDATE_URI =
		Uri.parse("content://telephony/carriers/preferapn_no_update");
		static final Uri PREFERAPN_NO_UPDATE_URI_USING_SUBID =
		Uri.parse("content://telephony/carriers/preferapn_no_update/subId/");
		static final String APN_ID = "apn_id";
		@@ -186,30 +184,6 @@ public final class DcTracker extends DcTrackerBase {

		/* IWLAN and WWAN co-exist flag */
		private boolean mWwanIwlanCoexistFlag = false;
		private long mSubId;


		private BroadcastReceiver defaultDdsBroadcastReceiver = new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		mSubId = mPhone.getSubId();
		log("got ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED, new DDS = "
		+ intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
		SubscriptionManager.INVALID_SUB_ID));
		updateSubIdAndCapability();

		if (mSubId == SubscriptionController.getInstance().getDefaultDataSubId()) {
		log("Dct is default-DDS now, process any pending MMS requests");
		}
		}
		};

		private BroadcastReceiver subInfoBroadcastReceiver = new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		mSubId = mPhone.getSubId();
		log("got ACTION_SUBINFO_RECORD_UPDATED, mySubId = " + mSubId);
		updateSubIdAndCapability();
		}
		};

		private CdmaApnProfileTracker mOmhApt;

		@@ -258,24 +232,6 @@ public final class DcTracker extends DcTrackerBase {
		addEmergencyApnSetting();

		mProvisionActionName = "com.android.internal.telephony.PROVISION" + p.getPhoneId();
		mPhone.getContext().registerReceiver(subInfoBroadcastReceiver,
		new IntentFilter(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED));

		mPhone.getContext().registerReceiver(defaultDdsBroadcastReceiver,
		new IntentFilter(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED));

		}

		private void processPendingNetworkRequests(NetworkRequest n) {
		((TelephonyNetworkFactory)mNetworkFactory).processPendingNetworkRequests(n);
		}

		private void updateSubIdAndCapability() {
		((TelephonyNetworkFactory)mNetworkFactory).updateNetworkCapability(mSubId);
		}

		private void releaseAllNetworkRequests() {
		((TelephonyNetworkFactory)mNetworkFactory).releaseAllNetworkRequests();
		}

		protected void registerForAllEvents() {
		@@ -326,6 +282,7 @@ public final class DcTracker extends DcTrackerBase {
		mProvisioningSpinner.dismiss();
		mProvisioningSpinner = null;
		}

		cleanUpAllConnections(true, null);

		super.dispose();
		@@ -365,180 +322,6 @@ public final class DcTracker extends DcTrackerBase {
		//SubscriptionManager.unregisterForDdsSwitch(this);
		}

		/* FIXME - LMR1_INTERNAL
		private class TelephonyNetworkFactory extends NetworkFactory {
		private PhoneBase mPhone;
		private NetworkCapabilities mNetworkCapabilities;

		//Thread safety not required as long as list operation are done by single thread.
		private SparseArray<NetworkRequest> mDdsRequests = new SparseArray<NetworkRequest>();

		public TelephonyNetworkFactory(Looper l, Context c, String TAG,
		NetworkCapabilities nc, PhoneBase phone) {
		super(l, c, TAG, nc);
		mPhone = phone;
		mNetworkCapabilities = nc;
		}

		public void processPendingNetworkRequests(NetworkRequest n) {
		for (int i = 0; i < mDdsRequests.size(); i++) {
		NetworkRequest nr = mDdsRequests.valueAt(i);
		if (nr.equals(n)) {
		log("Found pending request in ddsRequest list = " + nr);
		ApnContext apnContext = apnContextForNetworkRequest(nr);
		if (apnContext != null) {
		log("Activating APN=" + apnContext);
		apnContext.incRefCount();
		}
		}
		}
		}

		private void registerOnDemandDdsCallback() {
		SubscriptionController subController = SubscriptionController.getInstance();

		subController.registerForOnDemandDdsLockNotification(mPhone.getSubId(),
		new SubscriptionController.OnDemandDdsLockNotifier() {
		public void notifyOnDemandDdsLockGranted(NetworkRequest n) {
		log("Got the tempDds lock for the request = " + n);
		processPendingNetworkRequests(n);
		}
		});
		}

		public void updateNetworkCapability(long subId) {
		log("update networkCapabilites for subId = " + subId);

		mNetworkCapabilities.setNetworkSpecifier(""+subId);
		if ((subId > 0 && SubscriptionController.getInstance().
		getSubState(subId) == SubscriptionManager.ACTIVE) &&
		(subId == SubscriptionController.getInstance().getDefaultDataSubId())) {
		log("INTERNET capability is with subId = " + subId);
		//Only defaultDataSub provides INTERNET.
		mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		} else {
		log("INTERNET capability is removed from subId = " + subId);
		mNetworkCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

		}
		setScoreFilter(50);
		registerOnDemandDdsCallback();

		log("Ready to handle network requests");
		}

		@Override
		protected void needNetworkFor(NetworkRequest networkRequest, int score) {
		// figure out the apn type and enable it
		if (DBG) log("Cellular needs Network for " + networkRequest);
		SubscriptionController subController = SubscriptionController.getInstance();
		log("subController = " + subController);

		long currentDds = subController.getDefaultDataSubId();
		long subId = mPhone.getSubId();
		long requestedSpecifier = subController.getSubIdFromNetworkRequest(networkRequest);

		log("CurrentDds = " + currentDds);
		log("mySubId = " + subId);
		log("Requested networkSpecifier = " + requestedSpecifier);
		log("my networkSpecifier = " + mNetworkCapabilities.getNetworkSpecifier());

		if (subId < 0) {
		log("Can't handle any network request now, subId not ready.");
		return;
		}

		// For clients that do not send subId in NetworkCapabilities,
		// Connectivity will send to all network factories. Accept only
		// when requestedSpecifier is same as current factory's subId
		if (requestedSpecifier != subId) {
		log("requestedSpecifier is not same as mysubId. Bail out.");
		return;
		}

		if (currentDds != requestedSpecifier) {
		log("This request would result in DDS switch");
		log("Requested DDS switch to subId = " + requestedSpecifier);

		//Queue this request and initiate temp DDS switch.
		//Once the DDS switch is done we will revist the pending requests.
		mDdsRequests.put(networkRequest.requestId, networkRequest);
		requestOnDemandDataSubscriptionLock(networkRequest);

		return;
		} else {
		if(isNetworkRequestForInternet(networkRequest)) {
		log("Activating internet request on subId = " + subId);
		ApnContext apnContext = apnContextForNetworkRequest(networkRequest);
		if (apnContext != null) {
		log("Activating APN=" + apnContext);
		apnContext.incRefCount();
		}
		} else {
		if(isValidRequest(networkRequest)) {
		//non-default APN requests for this subscription.
		mDdsRequests.put(networkRequest.requestId, networkRequest);
		requestOnDemandDataSubscriptionLock(networkRequest);
		} else {
		log("Bogus request req = " + networkRequest);
		}
		}
		}
		}

		private boolean isValidRequest(NetworkRequest n) {
		int[] types = n.networkCapabilities.getCapabilities();
		return (types.length > 0);
		}

		private boolean isNetworkRequestForInternet(NetworkRequest n) {
		boolean flag = n.networkCapabilities.hasCapability
		(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		log("Is the request for Internet = " + flag);
		return flag;
		}

		private void requestOnDemandDataSubscriptionLock(NetworkRequest n) {
		if(!isNetworkRequestForInternet(n)) {
		//Request tempDDS lock only for non-default PDP requests
		SubscriptionController subController = SubscriptionController.getInstance();
		log("requestOnDemandDataSubscriptionLock for request = " + n);
		subController.startOnDemandDataSubscriptionRequest(n);
		}
		}

		private void removeRequestFromList(SparseArray<NetworkRequest> list, NetworkRequest n) {
		NetworkRequest nr = list.get(n.requestId);
		if (nr != null) {
		log("Removing request = " + nr);
		list.remove(n.requestId);
		ApnContext apnContext = apnContextForNetworkRequest(n);
		if (apnContext != null) {
		log("Deactivating APN=" + apnContext);
		apnContext.decRefCount();
		}
		}
		}

		private void removeRequestIfFound(NetworkRequest n) {
		log("Release the request from dds queue, if found");
		removeRequestFromList(mDdsRequests, n);

		if(!isNetworkRequestForInternet(n)) {
		SubscriptionController subController = SubscriptionController.getInstance();
		subController.stopOnDemandDataSubscriptionRequest(n);
		} else {
		// Internet requests are not queued in DDS list. So deactivate here explicitly.
		ApnContext apnContext = apnContextForNetworkRequest(n);
		if (apnContext != null) {
		log("Deactivating APN=" + apnContext);
		apnContext.decRefCount();
		}
		}
		}
		}
		*/

		@Override
		public void incApnRefCount(String name) {
		ApnContext apnContext = mApnContexts.get(name);
		@@ -547,28 +330,6 @@ public final class DcTracker extends DcTrackerBase {
		}
		}


		/* FIXME - LMR1_INTERNAL
		@Override
		protected void releaseNetworkFor(NetworkRequest networkRequest) {
		if (DBG) log("Cellular releasing Network for " + networkRequest);
		removeRequestIfFound(networkRequest);
		}

		public void releaseAllNetworkRequests() {
		log("releaseAllNetworkRequests");
		SubscriptionController subController = SubscriptionController.getInstance();
		for (int i = 0; i < mDdsRequests.size(); i++) {
		NetworkRequest nr = mDdsRequests.valueAt(i);
		if (nr != null) {
		log("Removing request = " + nr);
		subController.stopOnDemandDataSubscriptionRequest(nr);
		mDdsRequests.remove(nr.requestId);
		}
		}
		}
		*/

		@Override
		public void decApnRefCount(String name) {
		ApnContext apnContext = mApnContexts.get(name);
		@@ -3037,7 +2798,7 @@ public final class DcTracker extends DcTrackerBase {
		return;
		}

		String subId = Long.toString(mPhone.getSubId());
		String subId = Integer.toString(mPhone.getSubId());
		Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID, subId);
		log("setPreferredApn: delete");
		ContentResolver resolver = mPhone.getContext().getContentResolver();
		@@ -3057,7 +2818,7 @@ public final class DcTracker extends DcTrackerBase {
		return null;
		}

		String subId = Long.toString(mPhone.getSubId());
		String subId = Integer.toString(mPhone.getSubId());
		Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID, subId);
		Cursor cursor = mPhone.getContext().getContentResolver().query(
		uri, new String[] { "_id", "name", "apn" },

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -615,7 +615,7 @@ public abstract class DcTrackerBase extends Handler {
		mDcTesterFailBringUpAll.dispose();
		}

		public long getSubId() {
		public int getSubId() {
		return mPhone.getSubId();
		}

		@@ -748,6 +748,7 @@ public abstract class DcTrackerBase extends Handler {
		public void setDataOnRoamingEnabled(boolean enabled) {
		if (getDataOnRoamingEnabled() != enabled) {
		final ContentResolver resolver = mPhone.getContext().getContentResolver();

		Settings.Global.putInt(resolver,
		Settings.Global.DATA_ROAMING + mPhone.getPhoneId(), enabled ? 1 : 0);
		// will trigger handleDataOnRoamingChange() through observer

src/java/com/android/internal/telephony/dataconnection/DctController.java

100644 → 100755

+379 −210

File changed.File mode changed from 100644 to 100755.

Preview size limit exceeded, changes collapsed.