From 7e15818350d94df420677f3a30f86dd2d1b0804d Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 27 Jan 2022 11:23:53 +0800 Subject: [PATCH] Expose local route exclusion APIs Bug: 184750836 Test: make update-api Test: atest FrameworksNetTests Change-Id: I70470ab3a945570a23607e39d18f9825d9e1d7aa CTS-Coverage-Bug: 184750836 --- core/api/current.txt | 2 ++ core/java/android/net/Ikev2VpnProfile.java | 2 -- core/java/android/net/PlatformVpnProfile.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index add4158230dbd..b16f4d0c024cd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -26572,6 +26572,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); @@ -26717,6 +26718,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 diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java index 55541377a0bf4..364df8bf256f2 100644 --- a/core/java/android/net/Ikev2VpnProfile.java +++ b/core/java/android/net/Ikev2VpnProfile.java @@ -931,8 +931,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) diff --git a/core/java/android/net/PlatformVpnProfile.java b/core/java/android/net/PlatformVpnProfile.java index 777a90c8985c2..3c45799e10f23 100644 --- a/core/java/android/net/PlatformVpnProfile.java +++ b/core/java/android/net/PlatformVpnProfile.java @@ -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;