Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev

am: 1b62d99433 Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
2017-09-11 05:00:34 +00:00
parent ed71e21541 1b62d99433
commit 775807f422
2 changed files with 9 additions and 4 deletions
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -431,9 +431,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"));