Merge "Telephony: Release on-demand dds request upon dct dispose." (41afb061) · Commits · e / os / android_frameworks_opt_telephony

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,10 @@ public final class DcTracker extends DcTrackerBase {
		((TelephonyNetworkFactory)mNetworkFactory).updateNetworkCapability(mSubId);
		}

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

		protected void registerForAllEvents() {
		mPhone.mCi.registerForAvailable(this, DctConstants.EVENT_RADIO_AVAILABLE, null);
		mPhone.mCi.registerForOffOrNotAvailable(this,
		@@ -341,6 +345,8 @@ public final class DcTracker extends DcTrackerBase {
		public void dispose() {
		if (DBG) log("GsmDCT.dispose");

		releaseAllNetworkRequests();

		if (mProvisionBroadcastReceiver != null) {
		mPhone.getContext().unregisterReceiver(mProvisionBroadcastReceiver);
		mProvisionBroadcastReceiver = null;
		@@ -574,6 +580,19 @@ public final class DcTracker extends DcTrackerBase {
		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
		protected void log(String s) {
		Log.d("TelephonyNetworkFactory" + mPhone.getSubId(), s);