commit 2753e826b2d0e7a4c5f80c3e825afa4aa579942b
author John Huang <jsh@google.com> Fri Jan 13 11:37:15 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 13 11:37:15 2012 -0800
tree 4ed529f0af2eb922c13c1cbabc53366a7d7595ad
parent 62472581c30a3202b7bbd86e644b4346d5a4e65c
parent 2fceb7fec09f903c8505f0889a09d431e7b743f1

Merge "Fix teardown of secondary connections on CDMA" into ics-mr1

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
index 2c4fdef..04ba42d 100644
--- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -1029,8 +1029,10 @@
                     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)