From 758ead6dd362f8b7c665603fb9d85038b3f72f27 Mon Sep 17 00:00:00 2001
From: Ayush Sharma <ayushsha@google.com>
Date: Thu, 16 Dec 2021 14:40:13 +0000
Subject: [PATCH] Revert "Unhide IpPrefix(InetAddress, int)"

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
---
 framework/api/current.txt                       | 1 -
 framework/api/system-current.txt                | 1 +
 framework/src/android/net/IpPrefix.java         | 2 ++
 tests/common/java/android/net/IpPrefixTest.java | 3 ---
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/api/current.txt b/framework/api/current.txt
index a75523496b..c53f29a5ef 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -206,7 +206,6 @@ package android.net {
   }
 
   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 int describeContents();
     method @NonNull public java.net.InetAddress getAddress();
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index 5337b3807c..7db8725582 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -131,6 +131,7 @@ package android.net {
   }
 
   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);
   }
 
diff --git a/framework/src/android/net/IpPrefix.java b/framework/src/android/net/IpPrefix.java
index c26a0b53bf..bf4481afc5 100644
--- a/framework/src/android/net/IpPrefix.java
+++ b/framework/src/android/net/IpPrefix.java
@@ -87,7 +87,9 @@ public final class IpPrefix implements Parcelable {
      *
      * @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).
+     * @hide
      */
+    @SystemApi
     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,
         // which is unnecessary because getAddress() already returns a clone.
diff --git a/tests/common/java/android/net/IpPrefixTest.java b/tests/common/java/android/net/IpPrefixTest.java
index f61c8c3583..50ecb42835 100644
--- a/tests/common/java/android/net/IpPrefixTest.java
+++ b/tests/common/java/android/net/IpPrefixTest.java
@@ -122,9 +122,6 @@ public class IpPrefixTest {
 
         p = new IpPrefix("[2001:db8::123]/64");
         assertEquals("2001:db8::/64", p.toString());
-
-        p = new IpPrefix(InetAddresses.parseNumericAddress("::128"), 64);
-        assertEquals("::/64", p.toString());
     }
 
     @Test