Actually resolve all IPs for Private DNS hostname

Previously, we reused the OneAddressPerFamilyNetwork which does
what it says on the tin.  For the resolution that will be used
to program netd this is not what we really want.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual testing of Private DNS passes
Bug: 64133961
Change-Id: Ieccc4d208b314b81061dc78d83848f97acefe04b

1 files changed, 3 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
index 284538342a72..c81624a87b4e 100644
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -822,9 +822,9 @@ public class NetworkMonitor extends StateMachine {
         private void resolveStrictModeHostname() {
             try {
                 // Do a blocking DNS resolution using the network-assigned nameservers.
-                mPrivateDnsConfig = new PrivateDnsConfig(
-                        mPrivateDnsProviderHostname,
-                        mNetwork.getAllByName(mPrivateDnsProviderHostname));
+                final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally(
+                        mNetwork, mPrivateDnsProviderHostname);
+                mPrivateDnsConfig = new PrivateDnsConfig(mPrivateDnsProviderHostname, ips);
             } catch (UnknownHostException uhe) {
                 mPrivateDnsConfig = null;
             }