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

Merge changes Icd3d09aa,I4b070964

Browse Source 
* changes:
  Include IPv6 DNS servers in wifi details
  Separate multiple DNS addresses with newlines.
This commit is contained in:
Treehugger Robot
2017-09-14 08:10:25 +00:00
committed by Gerrit Code Review
parent 9b7479f8a9 5b206aec69
commit a0661c4fdf
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,11 +415,10 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
} }
} }
// Find IPv4 DNS addresses. // Find all (IPv4 and IPv6) DNS addresses.
String dnsServers = mLinkProperties.getDnsServers().stream() String dnsServers = mLinkProperties.getDnsServers().stream()
.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);

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

@@ -402,10 +402,14 @@ public class WifiDetailPreferenceControllerTest {
public void dnsServersPref_shouldHaveDetailTextSet() throws UnknownHostException { public void dnsServersPref_shouldHaveDetailTextSet() throws UnknownHostException {
mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,4,4})); mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,4,4}));
mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,8,8})); mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,8,8}));
mLinkProperties.addDnsServer(Constants.IPV6_DNS);
displayAndResume(); displayAndResume();
verify(mockDnsPref).setDetailText("8.8.4.4,8.8.8.8"); verify(mockDnsPref).setDetailText(
"8.8.4.4\n" +
"8.8.8.8\n" +
Constants.IPV6_DNS.getHostAddress());
} }
@Test @Test
@@ -511,13 +515,15 @@ public class WifiDetailPreferenceControllerTest {
lp.addDnsServer(Constants.IPV6_DNS); lp.addDnsServer(Constants.IPV6_DNS);
updateLinkProperties(lp); 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_DNS1);
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.IPV6_DNS.getHostAddress() + "\n" +
Constants.IPV4_DNS1.getHostAddress() + "\n" +
Constants.IPV4_DNS2.getHostAddress()); Constants.IPV4_DNS2.getHostAddress());
inOrder.verify(mockDnsPref).setVisible(true); inOrder.verify(mockDnsPref).setVisible(true);
} }