From 049d515dc47f6d2b750eee0451c5751affb919db Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Mon, 28 Aug 2017 17:20:02 -0700 Subject: [PATCH 1/2] 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) --- .../settings/wifi/details/WifiDetailPreferenceController.java | 2 +- .../wifi/details/WifiDetailPreferenceControllerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index f3db5e51d98..115535b4136 100644 --- 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 2aa338c2004..5097595835f 100644 --- 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); } From 5b206aec69f4965ce59e6e908abf15f1bcd6893e Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Wed, 6 Sep 2017 18:05:48 +0900 Subject: [PATCH 2/2] Include IPv6 DNS servers in wifi details Test: as follows - built - flashed - booted - export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \ make -j RunSettingsRoboTests RunSettingsRoboTests: RunSettingsRoboTests: Time: 19.821 RunSettingsRoboTests: RunSettingsRoboTests: OK (37 tests) RunSettingsRoboTests: - make -j RunSettingsRoboTests RunSettingsRoboTests: ........................... RunSettingsRoboTests: Time: 424.847 RunSettingsRoboTests: RunSettingsRoboTests: OK (2250 tests) RunSettingsRoboTests: Bug: 65037256 Bug: 65467586 Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32 Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29 (cherry picked from commit 9adc5887490953c6d239a634d6ebca4cd3081dc6) --- .../wifi/details/WifiDetailPreferenceController.java | 3 +-- .../details/WifiDetailPreferenceControllerTest.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 115535b4136..23e547aea0e 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -415,9 +415,8 @@ 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("\n")); 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 5097595835f..5c1b103ba08 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -402,10 +402,14 @@ public class WifiDetailPreferenceControllerTest { public void dnsServersPref_shouldHaveDetailTextSet() throws UnknownHostException { mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,4,4})); mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,8,8})); + mLinkProperties.addDnsServer(Constants.IPV6_DNS); displayAndResume(); - verify(mockDnsPref).setDetailText("8.8.4.4\n8.8.8.8"); + verify(mockDnsPref).setDetailText( + "8.8.4.4\n" + + "8.8.8.8\n" + + Constants.IPV6_DNS.getHostAddress()); } @Test @@ -511,12 +515,14 @@ public class WifiDetailPreferenceControllerTest { lp.addDnsServer(Constants.IPV6_DNS); updateLinkProperties(lp); - inOrder.verify(mockDnsPref, never()).setVisible(true); + inOrder.verify(mockDnsPref).setDetailText(Constants.IPV6_DNS.getHostAddress()); + inOrder.verify(mockDnsPref).setVisible(true); lp.addDnsServer(Constants.IPV4_DNS1); lp.addDnsServer(Constants.IPV4_DNS2); updateLinkProperties(lp); inOrder.verify(mockDnsPref).setDetailText( + Constants.IPV6_DNS.getHostAddress() + "\n" + Constants.IPV4_DNS1.getHostAddress() + "\n" + Constants.IPV4_DNS2.getHostAddress()); inOrder.verify(mockDnsPref).setVisible(true);