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

am 3c3490c8: Use new RouteInfo class.

Browse Source 
* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
  Use new RouteInfo class.
This commit is contained in:
Robert Greenwalt
2011-05-02 13:29:26 -07:00
committed by Android Git Automerger
parent a9b3463ea4 3c3490c819
commit d65d1adb56
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import android.net.NetworkInfo.DetailedState;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.Proxy; import android.net.Proxy;
import android.net.ProxyProperties; import android.net.ProxyProperties;
import android.net.RouteInfo;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.IpAssignment;
import android.net.wifi.WifiConfiguration.AuthAlgorithm; import android.net.wifi.WifiConfiguration.AuthAlgorithm;
@@ -434,7 +435,7 @@ public class WifiConfigController implements TextWatcher,
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return R.string.wifi_ip_settings_invalid_gateway; return R.string.wifi_ip_settings_invalid_gateway;
} }
linkProperties.addGateway(gatewayAddr); linkProperties.addRoute(new RouteInfo(gatewayAddr));
String dns = mDns1View.getText().toString(); String dns = mDns1View.getText().toString();
InetAddress dnsAddr = null; InetAddress dnsAddr = null;
@@ -605,10 +606,13 @@ public class WifiConfigController implements TextWatcher,
.getNetworkPrefixLength())); .getNetworkPrefixLength()));
} }
Iterator<InetAddress>gateways = linkProperties.getGateways().iterator(); for (RouteInfo route : linkProperties.getRoutes()) {
if (gateways.hasNext()) { if (route.isDefaultRoute()) {
mGatewayView.setText(gateways.next().getHostAddress()); mGatewayView.setText(route.getGateway().getHostAddress());
break;
} }
}
Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator(); Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator();
if (dnsIterator.hasNext()) { if (dnsIterator.hasNext()) {
mDns1View.setText(dnsIterator.next().getHostAddress()); mDns1View.setText(dnsIterator.next().getHostAddress());