diff options
| author | Wink Saville <wink@google.com> | 2011-04-16 14:50:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-16 14:50:10 -0700 |
| commit | 982db1c3a57ea49d6dba900a780321b5246c8586 (patch) | |
| tree | 6f5e2d825a47c74cca95f24024fc55c454f11760 /telephony | |
| parent | e7683c5f78508ab36374d749c2e487d35cfa4f10 (diff) | |
| parent | d86e06f7db0705b5fa64f23dcecf305133d2acc7 (diff) | |
| download | frameworks_base-982db1c3a57ea49d6dba900a780321b5246c8586.zip frameworks_base-982db1c3a57ea49d6dba900a780321b5246c8586.tar.gz frameworks_base-982db1c3a57ea49d6dba900a780321b5246c8586.tar.bz2 | |
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.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ServiceStateTracker.java | 4 |
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(); } |