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

Merge "Only set excludeLocalRoutes in the bypassable VpnProfile" am: b70a0862ff am: bfc4c06f12

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

Change-Id: I3384a2d59f38921c21cfe60aab8a080a96d8ccbb
This commit is contained in:
Chiachang Wang
2022-01-11 14:23:38 +00:00
committed by Automerger Merge Worker
parent 4e95f53863 bfc4c06f12
commit f1f4773f49
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import android.annotation.Nullable;
import android.annotation.RequiresFeature; import android.annotation.RequiresFeature;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.security.Credentials; import android.security.Credentials;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
@@ -70,6 +71,7 @@ import java.util.Objects;
* Exchange, Version 2 (IKEv2)</a> * Exchange, Version 2 (IKEv2)</a>
*/ */
public final class Ikev2VpnProfile extends PlatformVpnProfile { public final class Ikev2VpnProfile extends PlatformVpnProfile {
private static final String TAG = Ikev2VpnProfile.class.getSimpleName();
/** Prefix for when a Private Key is an alias to look for in KeyStore @hide */ /** Prefix for when a Private Key is an alias to look for in KeyStore @hide */
public static final String PREFIX_KEYSTORE_ALIAS = "KEYSTORE_ALIAS:"; public static final String PREFIX_KEYSTORE_ALIAS = "KEYSTORE_ALIAS:";
/** Prefix for when a Private Key is stored directly in the profile @hide */ /** Prefix for when a Private Key is stored directly in the profile @hide */
@@ -524,7 +526,10 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
throw new IllegalArgumentException("Invalid auth method set"); throw new IllegalArgumentException("Invalid auth method set");
} }
builder.setExcludeLocalRoutes(profile.excludeLocalRoutes); if (profile.excludeLocalRoutes && !profile.isBypassable) {
Log.w(TAG, "ExcludeLocalRoutes should only be set in the bypassable VPN");
}
builder.setExcludeLocalRoutes(profile.excludeLocalRoutes && profile.isBypassable);
return builder.build(); return builder.build();
} }