commit 73ac95156687df785d9b679a9d9e846b6df0e9e5
author lucaslin <lucaslin@google.com> Wed Apr 03 04:35:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 04:35:21 2019 -0700
tree 09c3384f9adf7b1dfabf5fe516193ac0a4e0dce3
parent 5ca20d48aae0d3d534d18a96600488e770c8b8d9
parent 266e2c5ac24f50a0cfd3f6db19dc972171cf37e9

Merge "Fix NetworkMonitor won't do private dns resolution" am: e121a329b8 am: 39810500f0
am: 266e2c5ac2

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c

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 22a0f18..6405254 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6382,6 +6382,11 @@
                 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);