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

Commit f4ba1705 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 

am: 5124d28e

Change-Id: I1e5de255c4ee11f46dc8a1e3f5eaca2f2be1c792
parents 38f4a190 5124d28e

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;

            }