Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 377dd020 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Expose local route exclusion APIs"

parents b0837996 7e158183

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25223,6 +25223,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);
@@ -25368,6 +25369,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

























core/java/android/net/Ikev2VpnProfile.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -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)

































core/java/android/net/PlatformVpnProfile.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -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;