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

Merge "Allow excludeLocalRoutes set only in bypassable profile" am: eaa3fc76a8 am: e6c1b94120 am: 9d00b2224a

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

Change-Id: Iadb59b8bf40309b8dffd03d28f01606c7423c8f1
This commit is contained in:
Chiachang Wang
2022-01-11 09:51:39 +00:00
committed by Automerger Merge Worker
parent 984591b424 9d00b2224a
commit 3c0d514eab
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,6 +163,10 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
// UnmodifiableList doesn't make a defensive copy by default. // UnmodifiableList doesn't make a defensive copy by default.
mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms)); mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms));
if (excludeLocalRoutes && !isBypassable) {
throw new IllegalArgumentException(
"Vpn should be byassable if excludeLocalRoutes is set");
}
mIsBypassable = isBypassable; mIsBypassable = isBypassable;
mIsMetered = isMetered; mIsMetered = isMetered;