commit 266e2c5ac24f50a0cfd3f6db19dc972171cf37e9
author lucaslin <lucaslin@google.com> Wed Apr 03 04:25:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 04:25:18 2019 -0700
tree 9e78221dc12ae96a752256e642d4c9a98389d727
parent e28dc820e407d36c23e266f8db24191e92e71270
parent 39810500f0487e63f091ff1b643c3f49f8bfaa05

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

Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627

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 946c81f..fc9d6f8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6389,6 +6389,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);