diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-04-12 12:07:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-12 12:07:14 -0700 |
| commit | 2d28d6229f8cb5e158998de421ee0a0d1ff865fe (patch) | |
| tree | 751a4f17208b6a5d4ee618ea132351caf1e06177 /services | |
| parent | 429664a52ab0d024757650a246297ae8224e60dc (diff) | |
| parent | 3016244ffb0ee59a191b294839468a81b45a01f1 (diff) | |
| download | frameworks_base-2d28d6229f8cb5e158998de421ee0a0d1ff865fe.zip frameworks_base-2d28d6229f8cb5e158998de421ee0a0d1ff865fe.tar.gz frameworks_base-2d28d6229f8cb5e158998de421ee0a0d1ff865fe.tar.bz2 | |
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
Add new route.hasGateway() api
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/wifi/WifiService.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index f320562..01625dd 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1470,8 +1470,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { loge("Error modifying route - no interface name"); return false; } - - if (r.isHostRoute() == false) { + if (r.hasGateway()) { RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getAllRoutes(), r.getGateway()); if (bestRoute != null) { if (bestRoute.getGateway().equals(r.getGateway())) { diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index f8d5d2e..4d23e5c 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -734,7 +734,7 @@ public final class WifiService extends IWifiManager.Stub { if (gateway instanceof Inet4Address) { info.gateway = NetworkUtils.inetAddressToInt((Inet4Address)gateway); } - } else if (r.isHostRoute()) { + } else if (r.hasGateway() == false) { LinkAddress dest = r.getDestination(); if (dest.getAddress() instanceof Inet4Address) { info.netmask = NetworkUtils.prefixLengthToNetmaskInt( |