diff options
| author | John Huang <jsh@google.com> | 2012-01-13 11:43:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-13 11:43:28 -0800 |
| commit | cf257fe5f3103d5e7af53b71e7b8cc76cf2be337 (patch) | |
| tree | 48db59f695082c7bc97f0c64ea07463d784dd45f | |
| parent | 9d66f9fe078fbbcfc7bd10ea0a35a04fe131bff4 (diff) | |
| parent | 70f52e6d795f1cd4d23efcbdc2b9e2f9d0c22eb6 (diff) | |
| download | frameworks_base-cf257fe5f3103d5e7af53b71e7b8cc76cf2be337.zip frameworks_base-cf257fe5f3103d5e7af53b71e7b8cc76cf2be337.tar.gz frameworks_base-cf257fe5f3103d5e7af53b71e7b8cc76cf2be337.tar.bz2 | |
am 70f52e6d: am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '70f52e6d795f1cd4d23efcbdc2b9e2f9d0c22eb6':
Fix teardown of secondary connections on CDMA
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnectionTracker.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index dab72a9..664a091 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -1038,8 +1038,10 @@ public abstract class DataConnectionTracker extends Handler { didDisable = true; } } - if (didDisable && enabledCount == 0) { - onCleanUpConnection(true, apnId, Phone.REASON_DATA_DISABLED); + if (didDisable) { + if (enabledCount == 0) { + onCleanUpConnection(true, apnId, Phone.REASON_DATA_DISABLED); + } // send the disconnect msg manually, since the normal route wont send // it (it's not enabled) |