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

Unhide IpPrefix(InetAddress, int)

Browse Source 
Unhide IpPrefix constructor to allow its usage with the new
VpnService.Builder#excludeRoute(IpPrefix) method.

Bug: 186082280
Test: atest IpPrefixTest
Change-Id: Ie5b62b2b206def1be53a41219681b4a8bc06c1d2
This commit is contained in:
Taras Antoshchuk
2021-09-20 14:22:18 +02:00
parent 62065db8d1
commit a5a1b80222
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/api/current.txt
View File

@@ -206,6 +206,7 @@ package android.net {
} }
public final class IpPrefix implements android.os.Parcelable { public final class IpPrefix implements android.os.Parcelable {
ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int);
method public boolean contains(@NonNull java.net.InetAddress); method public boolean contains(@NonNull java.net.InetAddress);
method public int describeContents(); method public int describeContents();
method @NonNull public java.net.InetAddress getAddress(); method @NonNull public java.net.InetAddress getAddress();

1
framework/api/system-current.txt
View File

@@ -131,7 +131,6 @@ package android.net {
} }
public final class IpPrefix implements android.os.Parcelable { public final class IpPrefix implements android.os.Parcelable {
ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int);
ctor public IpPrefix(@NonNull String); ctor public IpPrefix(@NonNull String);
} }

2
framework/src/android/net/IpPrefix.java
View File

@@ -87,9 +87,7 @@ public final class IpPrefix implements Parcelable {
* *
* @param address the IP address. Must be non-null. * @param address the IP address. Must be non-null.
* @param prefixLength the prefix length. Must be >= 0 and <= (32 or 128) (IPv4 or IPv6). * @param prefixLength the prefix length. Must be >= 0 and <= (32 or 128) (IPv4 or IPv6).
* @hide
*/ */
@SystemApi
public IpPrefix(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength) { public IpPrefix(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength) {
// We don't reuse the (byte[], int) constructor because it calls clone() on the byte array, // We don't reuse the (byte[], int) constructor because it calls clone() on the byte array,
// which is unnecessary because getAddress() already returns a clone. // which is unnecessary because getAddress() already returns a clone.

3
tests/common/java/android/net/IpPrefixTest.java
View File

@@ -122,6 +122,9 @@ public class IpPrefixTest {
p = new IpPrefix("[2001:db8::123]/64"); p = new IpPrefix("[2001:db8::123]/64");
assertEquals("2001:db8::/64", p.toString()); assertEquals("2001:db8::/64", p.toString());
p = new IpPrefix(InetAddresses.parseNumericAddress("::128"), 64);
assertEquals("::/64", p.toString());
} }
@Test @Test