am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a

Original change: undetermined Change-Id: Ibc51a632ebbfd884f237db9102fe018848052d21
2021-05-31 04:16:24 +00:00
parent f0b212080d 198b24d59a
commit 105fa5bcbf
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
@@ -1294,6 +1294,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                    }
                    if (!teardown(otherNet)) {
                        loge("Network declined teardown request");
+                        teardown(thisNet);
                        return;
                    }
                }