diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-03-27 21:58:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 21:59:10 +0000 |
| commit | cdee9727e26721910a44ba67980b39de4b103f7d (patch) | |
| tree | d6804355e920678917369833b4a72a6ac8d6b884 /core/java | |
| parent | 44bed6af1d40e529b51d992507d7dd3370abf262 (diff) | |
| parent | fdadc4e242d987c09007df274e01fe678a82331f (diff) | |
| download | frameworks_base-cdee9727e26721910a44ba67980b39de4b103f7d.zip frameworks_base-cdee9727e26721910a44ba67980b39de4b103f7d.tar.gz frameworks_base-cdee9727e26721910a44ba67980b39de4b103f7d.tar.bz2 | |
Merge "Make isHostRoute match only host routes" into jb-mr2-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/RouteInfo.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 3a7abc0..cc3c5f7 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -132,7 +132,10 @@ public class RouteInfo implements Parcelable { } private boolean isHost() { - return (mGateway.equals(Inet4Address.ANY) || mGateway.equals(Inet6Address.ANY)); + return (mDestination.getAddress() instanceof Inet4Address && + mDestination.getNetworkPrefixLength() == 32) || + (mDestination.getAddress() instanceof Inet6Address && + mDestination.getNetworkPrefixLength() == 128); } private boolean isDefault() { |