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

Revert "Unhide IpPrefix(InetAddress, int)"

Browse Source 
Revert "Add APIs that allow to exclude routes from VPN"

Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: Id0c373fb042a98c1c68807acf7fcfe456520ebe2
BUG: 210979001
This commit is contained in:
Ayush Sharma
2021-12-16 14:40:13 +00:00
parent f4882153ed
commit 758ead6dd3
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/api/current.txt
View File

@@ -206,7 +206,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);
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,6 +131,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);
ctor public IpPrefix(@NonNull String); ctor public IpPrefix(@NonNull String);
} }

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

@@ -87,7 +87,9 @@ 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 &gt;= 0 and &lt;= (32 or 128) (IPv4 or IPv6). * @param prefixLength the prefix length. Must be &gt;= 0 and &lt;= (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,9 +122,6 @@ 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