summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-04-16 14:44:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-16 14:44:08 -0700
commitdf43e321778a02f9eaeb8faacf4ae7917c434106 (patch)
tree2c8a6be3aca9e93bacfc85e1029d5b9964d8269a /telephony
parentdc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4 (diff)
parent157f9a0449228f8e3fe5d285c9746875aeff1581 (diff)
downloadframeworks_base-df43e321778a02f9eaeb8faacf4ae7917c434106.zip
frameworks_base-df43e321778a02f9eaeb8faacf4ae7917c434106.tar.gz
frameworks_base-df43e321778a02f9eaeb8faacf4ae7917c434106.tar.bz2
Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
Diffstat (limited to 'telephony')
-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 e58ccfc..695805c 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();
}