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

John Huang · Android (Google) Code Review · commit 2753e826b2d0 · 2012-01-13T11:37:15.000-08:00
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -1029,8 +1029,10 @@ protected void onEnableApn(int apnId, int enabled) {
                     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)

Original file line number	Diff line number	Diff line change
`@@ -1029,8 +1029,10 @@ protected void onEnableApn(int apnId, int enabled) {`
`1029`	`1029`	`didDisable = true;`
`1030`	`1030`	`}`
`1031`	`1031`	`}`
`1032`		`- if (didDisable && enabledCount == 0) {`
`1033`		`- onCleanUpConnection(true, apnId, Phone.REASON_DATA_DISABLED);`
	`1032`	`+ if (didDisable) {`
	`1033`	`+ if (enabledCount == 0) {`
	`1034`	`+ onCleanUpConnection(true, apnId, Phone.REASON_DATA_DISABLED);`
	`1035`	`+ }`
`1034`	`1036`
`1035`	`1037`	`// send the disconnect msg manually, since the normal route wont send`
`1036`	`1038`	`// it (it's not enabled)`