Separate multiple DNS addresses with newlines.

Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be8e8bda36c451e1ba9651b37eead560)

diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index f3db5e5..115535b 100644 (file)
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -419,7 +419,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
         String dnsServers = mLinkProperties.getDnsServers().stream()
                 .filter(Inet4Address.class::isInstance)
                 .map(InetAddress::getHostAddress)
-                .collect(Collectors.joining(","));
+                .collect(Collectors.joining("\n"));
 
         // Update UI.
         updatePreference(mIpAddressPref, ipv4Address);

diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 2aa338c..5097595 100644 (file)
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -405,7 +405,7 @@ public class WifiDetailPreferenceControllerTest {
 
         displayAndResume();
 
-        verify(mockDnsPref).setDetailText("8.8.4.4,8.8.8.8");
+        verify(mockDnsPref).setDetailText("8.8.4.4\n8.8.8.8");
     }
 
     @Test
@@ -517,7 +517,7 @@ public class WifiDetailPreferenceControllerTest {
         lp.addDnsServer(Constants.IPV4_DNS2);
         updateLinkProperties(lp);
         inOrder.verify(mockDnsPref).setDetailText(
-                Constants.IPV4_DNS1.getHostAddress() + "," +
+                Constants.IPV4_DNS1.getHostAddress() + "\n" +
                 Constants.IPV4_DNS2.getHostAddress());
         inOrder.verify(mockDnsPref).setVisible(true);
     }