resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp

Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00 · 2011-04-04 16:26:42 -07:00 · 1851011379
commit 1851011379
parent f7dae30b20 e00e35a54c
1 changed files with 1 additions and 0 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@ -1289,6 +1289,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                    }
                    if (!teardown(otherNet)) {
                        loge("Network declined teardown request");
+                        teardown(thisNet);
                        return;
                    }
                }