LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: I9fe40b60f31f0897f8cb62a39787536cd5524157
This commit is contained in:
Aaron Huang
2021-04-06 14:06:51 +00:00
committed by Automerger Merge Worker
parent e9a8490c15 c6cb931f32
commit 3194606bc9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/net/IpConfigStore.java
View File

@@ -22,7 +22,6 @@ import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings; import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.net.RouteInfo;
import android.net.StaticIpConfiguration; import android.net.StaticIpConfiguration;
import android.net.Uri; import android.net.Uri;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -322,11 +321,14 @@ public class IpConfigStore {
if (in.readInt() == 1) { if (in.readInt() == 1) {
gateway = InetAddresses.parseNumericAddress(in.readUTF()); gateway = InetAddresses.parseNumericAddress(in.readUTF());
} }
RouteInfo route = new RouteInfo(dest, gateway); // If the destination is a default IPv4 route, use the gateway
if (route.isIPv4Default() && gatewayAddress == null) { // address unless already set.
if (dest.getAddress() instanceof Inet4Address
&& dest.getPrefixLength() == 0 && gatewayAddress == null) {
gatewayAddress = gateway; gatewayAddress = gateway;
} else { } else {
loge("Non-IPv4 default or duplicate route: " + route); loge("Non-IPv4 default or duplicate route: "
+ dest.getAddress());
} }
} }
} else if (key.equals(DNS_KEY)) { } else if (key.equals(DNS_KEY)) {