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

Merge "Use the new LinkProperties gateways."

Browse Source
This commit is contained in:
Robert Greenwalt
2011-02-11 11:38:51 -08:00
committed by Android (Google) Code Review
parent f942732c4c caf8cf5cf5
commit cd44f206e0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,13 @@ public class WifiConfigController implements TextWatcher,
if (!InetAddress.isNumeric(gateway)) { if (!InetAddress.isNumeric(gateway)) {
return R.string.wifi_ip_settings_invalid_gateway; return R.string.wifi_ip_settings_invalid_gateway;
} }
linkProperties.setGateway(InetAddress.getByName(gateway)); InetAddress gatewayAddr;
try {
gatewayAddr = InetAddress.getByName(gateway);
} catch (UnknownHostException e) {
return R.string.wifi_ip_settings_invalid_gateway;
}
linkProperties.addGateway(gatewayAddr);
String dns = mDns1View.getText().toString(); String dns = mDns1View.getText().toString();
if (!InetAddress.isNumeric(dns)) { if (!InetAddress.isNumeric(dns)) {
@@ -591,9 +597,10 @@ public class WifiConfigController implements TextWatcher,
mNetworkPrefixLengthView.setText(Integer.toString(linkAddress mNetworkPrefixLengthView.setText(Integer.toString(linkAddress
.getNetworkPrefixLength())); .getNetworkPrefixLength()));
} }
InetAddress gateway = linkProperties.getGateway();
if (gateway != null) { Iterator<InetAddress>gateways = linkProperties.getGateways().iterator();
mGatewayView.setText(linkProperties.getGateway().getHostAddress()); if (gateways.hasNext()) {
mGatewayView.setText(gateways.next().getHostAddress());
} }
Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator(); Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator();
if (dnsIterator.hasNext()) { if (dnsIterator.hasNext()) {