Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose local route exclusion APIs" am: 377dd020fe am: 8a26f53a68 am: 5417b89233

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962799

Change-Id: Id2abe8239abea750b9cd09c271e2b2729acb0c66
This commit is contained in:
Chiachang Wang
2022-01-27 11:23:28 +00:00
committed by Automerger Merge Worker
parent 599fe55867 5417b89233
commit d9ff943b80
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -25283,6 +25283,7 @@ package android.net {
method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthPsk(@NonNull byte[]);
method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthUsernamePassword(@NonNull String, @NonNull String, @Nullable java.security.cert.X509Certificate);
method @NonNull public android.net.Ikev2VpnProfile.Builder setBypassable(boolean);
method @NonNull public android.net.Ikev2VpnProfile.Builder setExcludeLocalRoutes(boolean);
method @NonNull public android.net.Ikev2VpnProfile.Builder setMaxMtu(int);
method @NonNull public android.net.Ikev2VpnProfile.Builder setMetered(boolean);
method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);
@@ -25428,6 +25429,7 @@ package android.net {
}
public abstract class PlatformVpnProfile {
method public final boolean getExcludeLocalRoutes();
method public final int getType();
method @NonNull public final String getTypeString();
field public static final int TYPE_IKEV2_IPSEC_PSK = 7; // 0x7

2
core/java/android/net/Ikev2VpnProfile.java
View File

@@ -1071,8 +1071,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
*
* Note that because the local traffic will always bypass the VPN,
* it is not possible to set this flag on a non-bypassable VPN.
*
* @hide TODO(184750836): unhide once the implementation is completed
*/
@NonNull
@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)

2
core/java/android/net/PlatformVpnProfile.java
View File

@@ -83,8 +83,6 @@ public abstract class PlatformVpnProfile {
/**
* Returns if the local traffic is exempted from the VPN.
*
* @hide TODO(184750836): unhide once the implementation is completed
*/
public final boolean getExcludeLocalRoutes() {
return mExcludeLocalRoutes;