Merge "Exclude IWLAN from data dormant" into rvc-dev (81306bdf) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+21 −18

Original line number	Original line	Diff line number	Diff line
	@@ -392,6 +392,8 @@ public class DcController extends StateMachine {
	}		}
	}		}

			if (mDataServiceManager.getTransportType()
			== AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {
	if (isAnyDataCallDormant && !isAnyDataCallActive) {		if (isAnyDataCallDormant && !isAnyDataCallActive) {
	// There is no way to indicate link activity per APN right now. So		// There is no way to indicate link activity per APN right now. So
	// Link Activity will be considered dormant only when all data calls		// Link Activity will be considered dormant only when all data calls
	@@ -399,19 +401,20 @@ public class DcController extends StateMachine {
	// If a single data call is in dormant state and none of the data		// If a single data call is in dormant state and none of the data
	// calls are active broadcast overall link state as dormant.		// calls are active broadcast overall link state as dormant.
	if (DBG) {		if (DBG) {
	log("onDataStateChanged: Data Activity updated to DORMANT. stopNetStatePoll");		log("onDataStateChanged: Data activity DORMANT. stopNetStatePoll");
	}		}
	mDct.sendStopNetStatPoll(DctConstants.Activity.DORMANT);		mDct.sendStopNetStatPoll(DctConstants.Activity.DORMANT);
	} else {		} else {
	if (DBG) {		if (DBG) {
	log("onDataStateChanged: Data Activity updated to NONE. " +		log("onDataStateChanged: Data Activity updated to NONE. "
	"isAnyDataCallActive = " + isAnyDataCallActive +		+ "isAnyDataCallActive = " + isAnyDataCallActive
	" isAnyDataCallDormant = " + isAnyDataCallDormant);		+ " isAnyDataCallDormant = " + isAnyDataCallDormant);
	}		}
	if (isAnyDataCallActive) {		if (isAnyDataCallActive) {
	mDct.sendStartNetStatPoll(DctConstants.Activity.NONE);		mDct.sendStartNetStatPoll(DctConstants.Activity.NONE);
	}		}
	}		}
			}

	if (DBG) {		if (DBG) {
	lr("onDataStateChanged: dcsToRetry=" + dcsToRetry		lr("onDataStateChanged: dcsToRetry=" + dcsToRetry

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ import android.net.LinkProperties;
	import android.os.AsyncResult;		import android.os.AsyncResult;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Looper;		import android.os.Looper;
			import android.telephony.AccessNetworkConstants;
	import android.telephony.data.ApnSetting;		import android.telephony.data.ApnSetting;
	import android.telephony.data.DataCallResponse;		import android.telephony.data.DataCallResponse;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;
	@@ -99,6 +100,8 @@ public class DcControllerTest extends TelephonyTest {
	LinkProperties lp = new LinkProperties();		LinkProperties lp = new LinkProperties();
	mResult = new UpdateLinkPropertyResult(lp);		mResult = new UpdateLinkPropertyResult(lp);
	doReturn(mResult).when(mDc).updateLinkProperty(any(DataCallResponse.class));		doReturn(mResult).when(mDc).updateLinkProperty(any(DataCallResponse.class));
			doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
			.when(mDataServiceManager).getTransportType();

	mDcc = DcController.makeDcc(mPhone, mDcTracker, mDataServiceManager,		mDcc = DcController.makeDcc(mPhone, mDcTracker, mDataServiceManager,
	new Handler(Looper.myLooper()), "");		new Handler(Looper.myLooper()), "");