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

Merge "Apply LinkProperties changes." into lmp-preview-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-06-11 19:11:57 +00:00
committed by Android (Google) Code Review
parent caf4b1dda2 a0ac614c08
commit 746c6ae949
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -551,7 +551,7 @@ public class WifiConfigController implements TextWatcher,
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
linkProperties.addDns(dnsAddr); linkProperties.addDnsServer(dnsAddr);
} }
if (mDns2View.length() > 0) { if (mDns2View.length() > 0) {
@@ -561,7 +561,7 @@ public class WifiConfigController implements TextWatcher,
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
linkProperties.addDns(dnsAddr); linkProperties.addDnsServer(dnsAddr);
} }
return 0; return 0;
} }
@@ -788,7 +788,7 @@ public class WifiConfigController implements TextWatcher,
} }
} }
Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator(); Iterator<InetAddress> dnsIterator = linkProperties.getDnsServers().iterator();
if (dnsIterator.hasNext()) { if (dnsIterator.hasNext()) {
mDns1View.setText(dnsIterator.next().getHostAddress()); mDns1View.setText(dnsIterator.next().getHostAddress());
} }