Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-20 00:39:14 +00:00
committed by Android (Google) Code Review
parent c2120a10f7 c560b654cb
commit dd08f4b96a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -822,9 +822,9 @@ public class NetworkMonitor extends StateMachine {
private void resolveStrictModeHostname() { private void resolveStrictModeHostname() {
try { try {
// Do a blocking DNS resolution using the network-assigned nameservers. // Do a blocking DNS resolution using the network-assigned nameservers.
mPrivateDnsConfig = new PrivateDnsConfig( final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally(
mPrivateDnsProviderHostname, mNetwork, mPrivateDnsProviderHostname);
mNetwork.getAllByName(mPrivateDnsProviderHostname)); mPrivateDnsConfig = new PrivateDnsConfig(mPrivateDnsProviderHostname, ips);
} catch (UnknownHostException uhe) { } catch (UnknownHostException uhe) {
mPrivateDnsConfig = null; mPrivateDnsConfig = null;
} }