Merge "Revert "Have a new method in NetworkAgentConfig.Builder to set allowBypass"" into sc-dev
diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt
index 663a4ff..9ca6d8f 100644
--- a/framework/api/module-lib-current.txt
+++ b/framework/api/module-lib-current.txt
@@ -36,11 +36,9 @@
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/framework/src/android/net/NetworkAgentConfig.java b/framework/src/android/net/NetworkAgentConfig.java
index 0bd2371..5e50a64 100644
--- a/framework/src/android/net/NetworkAgentConfig.java
+++ b/framework/src/android/net/NetworkAgentConfig.java
@@ -64,16 +64,6 @@
}
/**
- * @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
* appropriate value based on previous user choice.
@@ -357,19 +347,6 @@
}
/**
- * 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.
*/
@NonNull