diff options
| author | 2022-08-19 10:00:52 +0000 | |
|---|---|---|
| committer | 2022-08-19 10:00:52 +0000 | |
| commit | ffda7e441b91d3078b1cdc40d7b6f64c41b000d4 (patch) | |
| tree | f38ce9f43505d8ed241102528432069d53d554dc | |
| parent | d3b7b975c07ba21bb5288b4298263790f6722e7c (diff) | |
| parent | 8048f8bbe9cddb359dba97c2ccad402f47bb633d (diff) | |
Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b2436597 am: 8048f8bbe9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189315
Change-Id: Ib82f18a9394affd69d5cbc078e158017f1db37d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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: |