LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix NetworkMonitor won't do private dns resolution"

Browse Source 
am: e121a329b8

Change-Id: I7c7a573bef77ba952219e6f6f56ab11f0211e0a7
This commit is contained in:
lucaslin
2019-04-03 04:13:48 -07:00
committed by android-build-merger
parent 997009af45 e121a329b8
commit 39810500f0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6389,6 +6389,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
Slog.wtf(TAG, networkAgent.name() + " connected with null LinkProperties"); 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()); handlePerNetworkPrivateDnsConfig(networkAgent, mDnsManager.getPrivateDnsConfig());
updateLinkProperties(networkAgent, new LinkProperties(networkAgent.linkProperties), updateLinkProperties(networkAgent, new LinkProperties(networkAgent.linkProperties),
null); null);