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

Commit dd08f4b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev

parents c2120a10 c560b654

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;

            }