commit 32b243659731c92156131b3d659176e76f271ad4
author Lucas Lin <lucaslin@google.com> Fri Aug 19 09:13:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 19 09:13:35 2022 +0000
tree 0db294905586ccbab06eca606a7dcb2c9878188a
parent 047585ed00cabd4ec3e9c186b9a9dc29cb28cc37
parent c43db8b4e6b9cb61e68568a567b0dcd5958530cb

Merge "Copy isBypassable flag from VpnProfile to VpnConfig"

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index a148f9c..931c692 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 @@
             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: