commit d9002eac4f2bbd18e59d9443e951c7e1e28da6bb
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 07 05:40:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 07 05:40:17 2021 +0000
tree fb30c9e51f9772bab0565be44bc58730cba6c9c7
parent 7f5c1bc46c965c3610ff345ed01f42828bc80326
parent a544e4b4179fd4b581fac51c3b7ff0467e0ac343

Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417

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

Change-Id: I517e242589fa979826c65817d5918ce05ced9866

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);