diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-02-11 11:38:44 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-11 11:38:44 -0800 |
commit | 614613e2d2fe51d484bfbeed6eeb8b66b151df37 (patch) | |
tree | 18b0152bc8f26f394c1fe4ef52e6745daa3f136c /services | |
parent | 9ee9aad80981c661af3f4c16f5932aef1f98e7b0 (diff) | |
parent | 992564e481af13cbcb058ee801f9254a520c54a1 (diff) | |
download | frameworks_base-614613e2d2fe51d484bfbeed6eeb8b66b151df37.zip frameworks_base-614613e2d2fe51d484bfbeed6eeb8b66b151df37.tar.gz frameworks_base-614613e2d2fe51d484bfbeed6eeb8b66b151df37.tar.bz2 |
Merge "Update LinkProperties treatment of gateways"
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 26397bb..8e39a63 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1414,13 +1414,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { LinkProperties p = nt.getLinkProperties(); if (p == null) return; String interfaceName = p.getInterfaceName(); - InetAddress defaultGatewayAddr = p.getGateway(); + if (TextUtils.isEmpty(interfaceName)) return; + for (InetAddress gateway : p.getGateways()) { - if ((interfaceName != null) && (defaultGatewayAddr != null )) { - if (!NetworkUtils.addDefaultRoute(interfaceName, defaultGatewayAddr) && DBG) { + if (!NetworkUtils.addDefaultRoute(interfaceName, gateway) && DBG) { NetworkInfo networkInfo = nt.getNetworkInfo(); log("addDefaultRoute for " + networkInfo.getTypeName() + - " (" + interfaceName + "), GatewayAddr=" + defaultGatewayAddr); + " (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress()); } } } |