Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912800b2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9 am:... 

Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9 am: 2e53c839 am: b5490b20 am: 4be562cc

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

Change-Id: I092d9fdf35b0418efb665ffaaabb76408c995989
parents 52e87c36 4be562cc

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

+4 −0
Original line number Diff line number Diff line
@@ -3789,6 +3789,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);