Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wink Saville
2011-04-16 14:44:08 -07:00
committed by Android (Google) Code Review
parent dc26a0c8d4 157f9a0449
commit df43e32177
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -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();
} }