Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5124d28e authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Actually resolve all IPs for Private DNS hostname" 

am: 5ace372b

Change-Id: I83ffc854b60f2beb0a9e4c8a107ce26b656c935e
parents 1cf2fb25 5ace372b

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

            }