commit 7b57b98e2693a2fc363f8dd0c6ed4cc69fed1a77
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 07 05:05:46 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 07 05:05:46 2021 +0000
tree fb30c9e51f9772bab0565be44bc58730cba6c9c7
parent ddfbb93dad410165f93ffe9406695c5c6d22a984
parent e0a9d1b039fe464b0979eaf1ffb11f04917cb33d

Merge "Split networkDestroy() and destroyNetworkCache()"

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 fd87a53..5aa3e5b 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3773,6 +3773,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);