Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6b6f6b1 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Use new VpnTransportInfo constructor" am: 0adb9137 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2345342



Change-Id: I13f8b4c741ae33a28c0a4381b13846ce7aa37668
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94caf026 0adb9137

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

+10 −3
Original line number Diff line number Diff line
@@ -646,7 +646,10 @@ public class Vpn { 
                .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)

                .setTransportInfo(new VpnTransportInfo(

                        VpnManager.TYPE_VPN_NONE, null /* sessionId */, false /* bypassable */))

                        VpnManager.TYPE_VPN_NONE,

                        null /* sessionId */,

                        false /* bypassable */,

                        false /* longLivedTcpConnectionsExpensive */))

                .build();



        loadAlwaysOnPackage();
@@ -711,7 +714,10 @@ public class Vpn { 
        mNetworkCapabilities = new NetworkCapabilities.Builder(mNetworkCapabilities)

                .setUids(null)

                .setTransportInfo(new VpnTransportInfo(

                        VpnManager.TYPE_VPN_NONE, null /* sessionId */, false /* bypassable */))

                        VpnManager.TYPE_VPN_NONE,

                        null /* sessionId */,

                        false /* bypassable */,

                        false /* longLivedTcpConnectionsExpensive */))

                .build();

    }
@@ -1570,7 +1576,8 @@ public class Vpn { 
                mConfig.allowedApplications, mConfig.disallowedApplications));



        capsBuilder.setTransportInfo(

                new VpnTransportInfo(getActiveVpnType(), mConfig.session, mConfig.allowBypass));

                new VpnTransportInfo(getActiveVpnType(), mConfig.session, mConfig.allowBypass,

                        false /* longLivedTcpConnectionsExpensive */));



        // Only apps targeting Q and above can explicitly declare themselves as metered.

        // These VPNs are assumed metered unless they state otherwise.