Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9a4 am: 2e53c839a1

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

Change-Id: Ibe4408e7eb1b23abe0ff8e92b06d4a04f26962de

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index fd87a534c216..5aa3e5be2ae9 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3773,6 +3773,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
     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);