Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf

am: d3f4a27c59 Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9
2017-09-14 08:17:00 +00:00
parent 91b143383c d3f4a27c59
commit de272fcd2a
2 changed files with 11 additions and 6 deletions
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -429,11 +429,10 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
            }
        }

-        // 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(","));
+                .collect(Collectors.joining("\n"));

        // Update UI.
        updatePreference(mIpAddressPref, ipv4Address);