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

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

Separate multiple DNS addresses with newlines. am: 2716e841 

am: cf37a267

Change-Id: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
parents 1dec9aa3 cf37a267

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

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

        String dnsServers = mLinkProperties.getDnsServers().stream()

                .filter(Inet4Address.class::isInstance)

                .filter(Inet4Address.class::isInstance)

                .map(InetAddress::getHostAddress)

                .map(InetAddress::getHostAddress)

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

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





        // Update UI.

        // Update UI.

        updatePreference(mIpAddressPref, ipv4Address);

        updatePreference(mIpAddressPref, ipv4Address);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -433,7 +433,7 @@ public class WifiDetailPreferenceControllerTest { 




        displayAndResume();

        displayAndResume();





        verify(mockDnsPref).setDetailText("8.8.4.4,8.8.8.8");

        verify(mockDnsPref).setDetailText("8.8.4.4\n8.8.8.8");

    }

    }





    @Test

    @Test
@@ -545,7 +545,7 @@ public class WifiDetailPreferenceControllerTest { 
        lp.addDnsServer(Constants.IPV4_DNS2);

        lp.addDnsServer(Constants.IPV4_DNS2);

        updateLinkProperties(lp);

        updateLinkProperties(lp);

        inOrder.verify(mockDnsPref).setDetailText(

        inOrder.verify(mockDnsPref).setDetailText(

                Constants.IPV4_DNS1.getHostAddress() + "," +

                Constants.IPV4_DNS1.getHostAddress() + "\n" +

                Constants.IPV4_DNS2.getHostAddress());

                Constants.IPV4_DNS2.getHostAddress());

        inOrder.verify(mockDnsPref).setVisible(true);

        inOrder.verify(mockDnsPref).setVisible(true);

    }

    }