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

Commit 035d2579 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Set legacy type for VPN" am: e19a7da4 am: 49082c00 

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

Change-Id: Ic6c3f0db93ddef11ca0bea3c0dda3f5101f69be3
parents a2a93786 49082c00

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1250,6 +1250,8 @@ public class Vpn { 
        updateState(DetailedState.CONNECTING, "agentConnect");

        updateState(DetailedState.CONNECTING, "agentConnect");





        final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()

        final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()

                .setLegacyType(ConnectivityManager.TYPE_VPN)

                .setLegacyTypeName("VPN")

                .setBypassableVpn(mConfig.allowBypass && !mLockdown)

                .setBypassableVpn(mConfig.allowBypass && !mLockdown)

                .build();

                .build();