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

Merge "Replace Inet[4|6]Address#ANY"

Browse Source
This commit is contained in:
Paul Hu
2021-03-08 07:20:21 +00:00
committed by Gerrit Code Review
parent ade6c2a5e9 b534331f2a
commit 055920ba58
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/src/android/net/RouteInfo.java
View File

@@ -26,6 +26,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.android.net.module.util.NetUtils; import com.android.net.module.util.NetUtils;
import com.android.net.module.util.NetworkStackConstants;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -181,9 +182,9 @@ public final class RouteInfo implements Parcelable {
if (destination == null) { if (destination == null) {
if (gateway != null) { if (gateway != null) {
if (gateway instanceof Inet4Address) { if (gateway instanceof Inet4Address) {
destination = new IpPrefix(Inet4Address.ANY, 0); destination = new IpPrefix(NetworkStackConstants.IPV4_ADDR_ANY, 0);
} else { } else {
destination = new IpPrefix(Inet6Address.ANY, 0); destination = new IpPrefix(NetworkStackConstants.IPV6_ADDR_ANY, 0);
} }
} else { } else {
// no destination, no gateway. invalid. // no destination, no gateway. invalid.
@@ -196,9 +197,9 @@ public final class RouteInfo implements Parcelable {
// ConnectivityService) to stop doing things like r.getGateway().equals(), ... . // ConnectivityService) to stop doing things like r.getGateway().equals(), ... .
if (gateway == null) { if (gateway == null) {
if (destination.getAddress() instanceof Inet4Address) { if (destination.getAddress() instanceof Inet4Address) {
gateway = Inet4Address.ANY; gateway = NetworkStackConstants.IPV4_ADDR_ANY;
} else { } else {
gateway = Inet6Address.ANY; gateway = NetworkStackConstants.IPV6_ADDR_ANY;
} }
} }
mHasGateway = (!gateway.isAnyLocalAddress()); mHasGateway = (!gateway.isAnyLocalAddress());