Merge "Cleanup network release" into mnc-dr-dev (5c27d315) · Commits · e / os / android_frameworks_opt_telephony

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

+21 −34

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@ public class DctController extends Handler {
		private static final int EVENT_RELEASE_REQUEST = 103;
		private static final int EVENT_RELEASE_ALL_REQUESTS = 104;
		private static final int EVENT_RETRY_ATTACH = 105;
		private static final int EVENT_SETTINGS_CHANGED = 106;
		private static final int EVENT_SUBSCRIPTIONS_CHANGED = 107;

		private static final int EVENT_DATA_ATTACHED = 500;
		private static final int EVENT_DATA_DETACHED = 600;
		@@ -92,7 +94,7 @@ public class DctController extends Handler {
		new OnSubscriptionsChangedListener() {
		@Override
		public void onSubscriptionsChanged() {
		onSubInfoReady();
		DctController.this.obtainMessage(EVENT_SUBSCRIPTIONS_CHANGED).sendToTarget();
		}
		};

		@@ -100,7 +102,7 @@ public class DctController extends Handler {
		@Override
		public void onChange(boolean selfChange) {
		logd("Settings change");
		onSettingsChange();
		DctController.this.obtainMessage(EVENT_SETTINGS_CHANGED).sendToTarget();
		}
		};

		@@ -297,6 +299,12 @@ public class DctController extends Handler {
		case EVENT_RETRY_ATTACH:
		onRetryAttach(msg.arg1);
		break;
		case EVENT_SETTINGS_CHANGED:
		onSettingsChanged();
		break;
		case EVENT_SUBSCRIPTIONS_CHANGED:
		onSubInfoReady();
		break;
		default:
		loge("Un-handled message [" + msg.what + "]");
		}
		@@ -457,7 +465,7 @@ public class DctController extends Handler {
		}
		}

		private void onSettingsChange() {
		private void onSettingsChanged() {
		//Sub Selection
		long dataSubId = mSubController.getDefaultDataSubId();

		@@ -704,15 +712,15 @@ public class DctController extends Handler {

		final LocalLog l = addLogger(networkRequest);

		if (!SubscriptionManager.isUsableSubIdValue(mPhone.getSubId())) {
		final String str = "SubId not useable, pending request.";
		if (!SubscriptionManager.isUsableSubIdValue(mPhone.getSubId()) \|\|
		getRequestPhoneId(networkRequest) != mPhone.getPhoneId()) {
		final String str = "Request not useable, pending request.";
		log(str);
		l.log(str);
		mPendingReq.put(networkRequest.requestId, networkRequest);
		return;
		}

		if (getRequestPhoneId(networkRequest) == mPhone.getPhoneId()) {
		DcTrackerBase dcTracker =((PhoneBase)mPhone).mDcTracker;
		String apn = apnForNetworkRequest(networkRequest);
		if (dcTracker.isApnSupported(apn)) {
		@@ -722,12 +730,6 @@ public class DctController extends Handler {
		log(str);
		l.log(str);
		}
		} else {
		final String str = "Request not send, put to pending";
		log(str);
		l.log(str);
		mPendingReq.put(networkRequest.requestId, networkRequest);
		}
		}

		@Override
		@@ -736,7 +738,7 @@ public class DctController extends Handler {
		log(str + networkRequest);
		final LocalLog l = requestLog(networkRequest.requestId, str);

		if (!SubscriptionManager.isUsableSubIdValue(mPhone.getSubId())) {
		if (mPendingReq.get(networkRequest.requestId) != null) {
		str = "Sub Info has not been ready, remove request.";
		log(str);
		if (l != null) l.log(str);
		@@ -744,22 +746,7 @@ public class DctController extends Handler {
		return;
		}

		if (getRequestPhoneId(networkRequest) == mPhone.getPhoneId()) {
		DcTrackerBase dcTracker =((PhoneBase)mPhone).mDcTracker;
		String apn = apnForNetworkRequest(networkRequest);
		if (dcTracker.isApnSupported(apn)) {
		releaseNetwork(networkRequest);
		} else {
		str = "Unsupported APN";
		log(str);
		if (l != null) l.log(str);
		}

		} else {
		str = "Request not released";
		log(str);
		if (l != null) l.log(str);
		}
		}

		@Override