diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-04 12:18:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 12:18:58 -0700 |
| commit | ab2194aadeb35a1f2eae6c4d3abd476b33f167f4 (patch) | |
| tree | 41b22f61ce558294891740e83af633b8c6e7a34b /services | |
| parent | 37229514c56dac0c1e3cef6bc8229232d0c75b96 (diff) | |
| parent | 27725e8cd1e2eb3b88186ae8d43e437f130b1f84 (diff) | |
| download | frameworks_base-ab2194aadeb35a1f2eae6c4d3abd476b33f167f4.zip frameworks_base-ab2194aadeb35a1f2eae6c4d3abd476b33f167f4.tar.gz frameworks_base-ab2194aadeb35a1f2eae6c4d3abd476b33f167f4.tar.bz2 | |
am 27725e8c: Only leave one default network up at a time.
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
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 4145854..a64ceb9 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1297,6 +1297,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { " teardown"); if (!teardown(otherNet)) { Slog.e(TAG, "Network declined teardown request"); + teardown(thisNet); return; } if (isFailover) { |