commit 3c5b0fd9dbe0e65f11f15881acb1fe23de7dd328
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 03 10:50:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 03 10:50:09 2019 +0000
tree 9e78221dc12ae96a752256e642d4c9a98389d727
parent 3f3d4bcb82afcb87ee12d2dc0ca724aac752ffab
parent b2d108480742750ce0a3b3187850120d5b657bb4

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

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);