diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-29 11:36:28 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-29 11:36:28 -0700 |
| commit | 27725e8cd1e2eb3b88186ae8d43e437f130b1f84 (patch) | |
| tree | e954968307360f7e95226acd419878ffad19c887 /services | |
| parent | 7544b23e52c004cda817874c54d88080b6e90bdc (diff) | |
| download | frameworks_base-27725e8cd1e2eb3b88186ae8d43e437f130b1f84.zip frameworks_base-27725e8cd1e2eb3b88186ae8d43e437f130b1f84.tar.gz frameworks_base-27725e8cd1e2eb3b88186ae8d43e437f130b1f84.tar.bz2 | |
Only leave one default network up at a time.
If original refuses to tear down, tear down new one. It's better
to have none (which will try to launch them all again) than two.
Really people shouldn't refuse the teardown request.
bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 1 |
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 6694dbe..8f0816d 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1266,6 +1266,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { " teardown"); if (!teardown(otherNet)) { Slog.e(TAG, "Network declined teardown request"); + teardown(thisNet); return; } if (isFailover) { |