Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am: 1b62d99433

am: 775807f422

Change-Id: I55fbd611fee9f17215412a76b480cdee96f62b32
This commit is contained in:
Erik Kline
2017-09-11 05:04:28 +00:00
committed by android-build-merger
2 changed files with 9 additions and 4 deletions

View File

@@ -446,9 +446,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
}
}
// Find IPv4 DNS addresses.
// Find all (IPv4 and IPv6) DNS addresses.
String dnsServers = mLinkProperties.getDnsServers().stream()
.filter(Inet4Address.class::isInstance)
.map(InetAddress::getHostAddress)
.collect(Collectors.joining("\n"));