diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-04 16:26:42 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-04 16:26:42 -0700 |
| commit | e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96 (patch) | |
| tree | 64c444d1d2e9395d8b8b860d4645c1e644a63256 /services | |
| parent | da8beef55612738d87d6aa520445377a9e4ae784 (diff) | |
| parent | ab2194aadeb35a1f2eae6c4d3abd476b33f167f4 (diff) | |
| download | frameworks_base-e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96.zip frameworks_base-e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96.tar.gz frameworks_base-e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96.tar.bz2 | |
resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
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 3a3f5e1..a5e9bb0 100644 --- 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; } } |