From b7b39bd3c7e3b5055f2395fa798d95426633bddd Mon Sep 17 00:00:00 2001
From: Joshua Mccloskey <joshmccloskey@google.com>
Date: Mon, 22 Mar 2021 18:55:32 +0000
Subject: [PATCH] Revert "Have a new method in NetworkAgentConfig.Builder to
 set allowBypass"

This reverts commit 0ad175531b803ce9ac8941c32e2e6db30e5bac6d.

Reason for revert: Broken build b/183416288

Change-Id: Id9ec9fb98b8f88eeb7db1d1442d76456aaf350d1
---
 .../framework/api/module-lib-current.txt      |  2 --
 .../src/android/net/NetworkAgentConfig.java   | 23 -------------------
 .../com/android/server/connectivity/Vpn.java  |  5 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/packages/Connectivity/framework/api/module-lib-current.txt b/packages/Connectivity/framework/api/module-lib-current.txt
index 663a4ff9dbf54..9ca6d8fedc680 100644
--- a/packages/Connectivity/framework/api/module-lib-current.txt
+++ b/packages/Connectivity/framework/api/module-lib-current.txt
@@ -36,11 +36,9 @@ package android.net {
 
   public final class NetworkAgentConfig implements android.os.Parcelable {
     method @Nullable public String getSubscriberId();
-    method public boolean isBypassableVpn();
   }
 
   public static final class NetworkAgentConfig.Builder {
-    method @NonNull public android.net.NetworkAgentConfig.Builder setBypassableVpn(boolean);
     method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);
   }
 
diff --git a/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java b/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java
index 0bd2371bfca8b..5e50a6404acb3 100644
--- a/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java
+++ b/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java
@@ -63,16 +63,6 @@ public final class NetworkAgentConfig implements Parcelable {
         return explicitlySelected;
     }
 
-    /**
-     * @return whether this VPN connection can be bypassed by the apps.
-     *
-     * @hide
-     */
-    @SystemApi(client = MODULE_LIBRARIES)
-    public boolean isBypassableVpn() {
-        return allowBypass;
-    }
-
     /**
      * Set if the user desires to use this network even if it is unvalidated. This field has meaning
      * only if {@link explicitlySelected} is true. If it is, this field must also be set to the
@@ -356,19 +346,6 @@ public final class NetworkAgentConfig implements Parcelable {
             return this;
         }
 
-        /**
-         * Sets whether the apps can bypass the VPN connection.
-         *
-         * @return this builder, to facilitate chaining.
-         * @hide
-         */
-        @NonNull
-        @SystemApi(client = MODULE_LIBRARIES)
-        public Builder setBypassableVpn(boolean allowBypass) {
-            mConfig.allowBypass = allowBypass;
-            return this;
-        }
-
         /**
          * Returns the constructed {@link NetworkAgentConfig} object.
          */
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 1b39d848097d8..64173bbcc500f 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1248,9 +1248,8 @@ public class Vpn {
         mLegacyState = LegacyVpnInfo.STATE_CONNECTING;
         updateState(DetailedState.CONNECTING, "agentConnect");
 
-        final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()
-                .setBypassableVpn(mConfig.allowBypass && !mLockdown)
-                .build();
+        NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder().build();
+        networkAgentConfig.allowBypass = mConfig.allowBypass && !mLockdown;
 
         capsBuilder.setOwnerUid(mOwnerUID);
         capsBuilder.setAdministratorUids(new int[] {mOwnerUID});