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

Merge "Deduplicate the isIpv6ULA implementation." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-19 02:25:20 +00:00
committed by Gerrit Code Review
parent 0b5fb22b1b a74b0066e0
commit 4b19802eee
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/android/net/LinkAddress.java
View File

@@ -37,6 +37,8 @@ import android.os.Parcelable;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Pair; import android.util.Pair;
import com.android.net.module.util.ConnectivityUtils;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
@@ -146,11 +148,7 @@ public class LinkAddress implements Parcelable {
* Per RFC 4193 section 8, fc00::/7 identifies these addresses. * Per RFC 4193 section 8, fc00::/7 identifies these addresses.
*/ */
private boolean isIpv6ULA() { private boolean isIpv6ULA() {
if (isIpv6()) { return ConnectivityUtils.isIPv6ULA(address);
byte[] bytes = address.getAddress();
return ((bytes[0] & (byte)0xfe) == (byte)0xfc);
}
return false;
} }
/** /**