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

Commit 607a13d9 authored by lucaslin's avatar lucaslin Committed by android-build-merger
Browse files

Merge "Fix NetworkMonitor won't do private dns resolution" am: c895b818 am: aecea736

am: 7d0a216e

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c
parents ed194a33 7d0a216e
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -6382,6 +6382,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
                Slog.wtf(TAG, networkAgent.name() + " connected with null LinkProperties");
            }

            // NetworkCapabilities need to be set before sending the private DNS config to
            // NetworkMonitor, otherwise NetworkMonitor cannot determine if validation is required.
            synchronized (networkAgent) {
                networkAgent.setNetworkCapabilities(networkAgent.networkCapabilities);
            }
            handlePerNetworkPrivateDnsConfig(networkAgent, mDnsManager.getPrivateDnsConfig());
            updateLinkProperties(networkAgent, new LinkProperties(networkAgent.linkProperties),
                    null);