commit e54dd7b83769f5ed2e196d89eda2f5f5286ec4d0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 07 06:07:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 07 06:07:32 2021 +0000
tree ddb6ba0023adc4f23aff6be662305dcd1ee63640
parent ec27c044d3bd883fb235ab51e0277c3e380ff09b
parent 6bcd3d1a2557239cb624c437924ee9e9070adc26

Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417 am: d9002eac4f am: 6bcd3d1a25

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020

Change-Id: I40eb6f8d8ea6924b05da34352dbc9192caa4b82e

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 7d3e633..922b21a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3789,6 +3789,10 @@
     private void destroyNativeNetwork(@NonNull NetworkAgentInfo networkAgent) {
         try {
             mNetd.networkDestroy(networkAgent.network.getNetId());
+        } catch (RemoteException | ServiceSpecificException e) {
+            loge("Exception destroying network(networkDestroy): " + e);
+        }
+        try {
             mDnsResolver.destroyNetworkCache(networkAgent.network.getNetId());
         } catch (RemoteException | ServiceSpecificException e) {
             loge("Exception destroying network: " + e);