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" am: e121a329b8 am: 39810500f0

Browse Source 
am: 266e2c5ac2

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c
This commit is contained in:
lucaslin
2019-04-03 04:35:21 -07:00
committed by android-build-merger
parent 5ca20d48aa 266e2c5ac2
commit 73ac951566
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

@@ -6382,6 +6382,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);