summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-04-04 16:44:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-04 16:44:25 -0700
commitb6c5d824c0eb34c218d18982c51b69c2df198220 (patch)
tree821ea415fb80c7e3b55b81594c0e301a646cfbdb /services
parentb76bcc07d859d1903501c13efd217d1c5be0b9dd (diff)
parente716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96 (diff)
downloadframeworks_base-b6c5d824c0eb34c218d18982c51b69c2df198220.zip
frameworks_base-b6c5d824c0eb34c218d18982c51b69c2df198220.tar.gz
frameworks_base-b6c5d824c0eb34c218d18982c51b69c2df198220.tar.bz2
am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96': Only leave one default network up at a time.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ConnectivityService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 3997702..f57f32e 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1294,6 +1294,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
if (!teardown(otherNet)) {
loge("Network declined teardown request");
+ teardown(thisNet);
return;
}
}