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

2012-01-13 11:37:15 -08:00
parent 62472581c3 2fceb7fec0
commit 2753e826b2
1 changed files with 4 additions and 2 deletions
--- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -1029,8 +1029,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)