From f96e5ad5805b68481feaf3305b6ff85cd76d3727 Mon Sep 17 00:00:00 2001
From: lucaslin <lucaslin@google.com>
Date: Thu, 18 Aug 2022 11:18:43 +0800
Subject: [PATCH] Copy isBypassable flag from VpnProfile to VpnConfig

Copy isBypassable flag from VpnProfile to VpnConfig so that
ConnectivityService can set the correct config to netd when
network is created.

VpnConfig#allowBypass isn't set for platform VPN when
startVpnProfilePrivileged tries to convert the VpnProfile
to VpnConfig.

Bug: 242931436
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2
(cherry picked from commit c43db8b4e6b9cb61e68568a567b0dcd5958530cb)
Merged-In: Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2
---
 services/core/java/com/android/server/connectivity/Vpn.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 9691b20066c7d..98238ccd93c32 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: