PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate multiple DNS addresses with newlines.

Browse Source 
Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be)
This commit is contained in:
Sundeep Ghuman
2017-08-28 17:20:02 -07:00
committed by Erik Kline
parent 9b7479f8a9
commit 049d515dc4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -419,7 +419,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
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);

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

@@ -405,7 +405,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
@@ -517,7 +517,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);
} }