Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf37a267 authored by Sundeep Ghuman's avatar Sundeep Ghuman Committed by android-build-merger
Browse files

Separate multiple DNS addresses with newlines. 

am: 2716e841

Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9
parents f76056c5 2716e841

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        String dnsServers = mLinkProperties.getDnsServers().stream()

                .filter(Inet4Address.class::isInstance)

                .map(InetAddress::getHostAddress)

                .collect(Collectors.joining(","));

                .collect(Collectors.joining("\n"));



        // Update UI.

        updatePreference(mIpAddressPref, ipv4Address);

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,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
@@ -546,7 +546,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);

    }