Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE (df43e321) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -398,7 +398,7 @@ public abstract class ServiceStateTracker extends Handler {
	synchronized (this) {		synchronized (this) {
	if (!mPendingRadioPowerOffAfterDataOff) {		if (!mPendingRadioPowerOffAfterDataOff) {
	if (dcTracker.isAnyActiveDataConnections()) {		if (dcTracker.isAnyActiveDataConnections()) {
	dcTracker.cleanUpAllConnections(null);		dcTracker.cleanUpAllConnections(Phone.REASON_RADIO_TURNED_OFF);
	Message msg = Message.obtain(this);		Message msg = Message.obtain(this);
	msg.what = EVENT_SET_RADIO_POWER_OFF;		msg.what = EVENT_SET_RADIO_POWER_OFF;
	msg.arg1 = ++mPendingRadioPowerOffAfterDataOffTag;		msg.arg1 = ++mPendingRadioPowerOffAfterDataOffTag;
	@@ -410,7 +410,7 @@ public abstract class ServiceStateTracker extends Handler {
	hangupAndPowerOff();		hangupAndPowerOff();
	}		}
	} else {		} else {
	dcTracker.cleanUpAllConnections(null);		dcTracker.cleanUpAllConnections(Phone.REASON_RADIO_TURNED_OFF);
	if (DBG) log("Data disconnected, turn off radio right away.");		if (DBG) log("Data disconnected, turn off radio right away.");
	hangupAndPowerOff();		hangupAndPowerOff();
	}		}