diff options
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 0741d46b6f29..bc9bc031ca35 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -645,7 +645,8 @@ public class Vpn { .addTransportType(NetworkCapabilities.TRANSPORT_VPN) .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED) - .setTransportInfo(new VpnTransportInfo(VpnManager.TYPE_VPN_NONE, null)) + .setTransportInfo(new VpnTransportInfo( + VpnManager.TYPE_VPN_NONE, null /* sessionId */, false /* bypassable */)) .build(); loadAlwaysOnPackage(); @@ -709,7 +710,8 @@ public class Vpn { private void resetNetworkCapabilities() { mNetworkCapabilities = new NetworkCapabilities.Builder(mNetworkCapabilities) .setUids(null) - .setTransportInfo(new VpnTransportInfo(VpnManager.TYPE_VPN_NONE, null)) + .setTransportInfo(new VpnTransportInfo( + VpnManager.TYPE_VPN_NONE, null /* sessionId */, false /* bypassable */)) .build(); } @@ -1567,7 +1569,8 @@ public class Vpn { capsBuilder.setUids(createUserAndRestrictedProfilesRanges(mUserId, mConfig.allowedApplications, mConfig.disallowedApplications)); - capsBuilder.setTransportInfo(new VpnTransportInfo(getActiveVpnType(), mConfig.session)); + capsBuilder.setTransportInfo( + new VpnTransportInfo(getActiveVpnType(), mConfig.session, mConfig.allowBypass)); // Only apps targeting Q and above can explicitly declare themselves as metered. // These VPNs are assumed metered unless they state otherwise. |