diff options
| author | 2022-08-19 10:19:37 +0000 | |
|---|---|---|
| committer | 2022-08-19 10:19:37 +0000 | |
| commit | 1378c0d23a8efb41c1e409281af95c2975d387d1 (patch) | |
| tree | 04996c4e816ae558d118966b27b47bb43a643069 | |
| parent | 9be18194ee9248f0ff58f25bd2407ebe8614af5d (diff) | |
| parent | fcb58c30a7607df651ecaf6921a038ba98676c05 (diff) | |
Merge "Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b2436597 am: 8048f8bbe9 am: ffda7e441b" into tm-d1-dev-plus-aosp
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index a148f9c51aab..931c692b5f01 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -4040,6 +4040,7 @@ public class Vpn { mConfig.proxyInfo = profile.proxy; mConfig.requiresInternetValidation = profile.requiresInternetValidation; mConfig.excludeLocalRoutes = profile.excludeLocalRoutes; + mConfig.allowBypass = profile.isBypassable; switch (profile.type) { case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: |