summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2011-04-16 14:47:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-16 14:47:17 -0700
commitd86e06f7db0705b5fa64f23dcecf305133d2acc7 (patch)
tree56c954cdfeac7c3e1c633cc0b38b5ad4fc19fa31
parentfa65533ef11e794b21580e5583a74d2d8ffb7047 (diff)
parentdf43e321778a02f9eaeb8faacf4ae7917c434106 (diff)
am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
* commit 'df43e321778a02f9eaeb8faacf4ae7917c434106': Telephony: Set Radio turned off reason when powered off.
-rw-r--r--telephony/java/com/android/internal/telephony/ServiceStateTracker.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
index e58ccfc64cf6..695805c682d5 100644
--- a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -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();
}