diff options
| author | 2021-04-06 14:06:51 +0000 | |
|---|---|---|
| committer | 2021-04-06 14:06:51 +0000 | |
| commit | 33fdb4a42a7fe90f998729286b54119bcc1b0671 (patch) | |
| tree | 3c3bd5d8a36c697ffb94daabf63923d4fe20e9d8 | |
| parent | f92723b053d62535c121b8307ae036b91ba69406 (diff) | |
| parent | 834026197f5938e877d83f35ae2d550f1036fc6f (diff) | |
Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290
Change-Id: I9fe40b60f31f0897f8cb62a39787536cd5524157
| -rw-r--r-- | services/core/java/com/android/server/net/IpConfigStore.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index 512d2192b9a8..df1eb6d9fe3c 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java @@ -22,7 +22,6 @@ import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; import android.net.ProxyInfo; -import android.net.RouteInfo; import android.net.StaticIpConfiguration; import android.net.Uri; import android.util.ArrayMap; @@ -322,11 +321,14 @@ public class IpConfigStore { if (in.readInt() == 1) { gateway = InetAddresses.parseNumericAddress(in.readUTF()); } - RouteInfo route = new RouteInfo(dest, gateway); - if (route.isIPv4Default() && gatewayAddress == null) { + // If the destination is a default IPv4 route, use the gateway + // address unless already set. + if (dest.getAddress() instanceof Inet4Address + && dest.getPrefixLength() == 0 && gatewayAddress == null) { gatewayAddress = gateway; } else { - loge("Non-IPv4 default or duplicate route: " + route); + loge("Non-IPv4 default or duplicate route: " + + dest.getAddress()); } } } else if (key.equals(DNS_KEY)) { |