am d86e06f7: am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

* commit 'd86e06f7db0705b5fa64f23dcecf305133d2acc7':
  Telephony: Set Radio turned off reason when powered off.
This commit is contained in:
Wink Saville
2011-04-16 14:50:10 -07:00
committed by Android Git Automerger

View File

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