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

Commit 49082c00 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Set legacy type for VPN" am: e19a7da4 

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

Change-Id: I30a234ade5efe99fb5ba7b5b916a1de9920bdbab
parents 41fbab49 e19a7da4

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

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



        final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()

                .setLegacyType(ConnectivityManager.TYPE_VPN)

                .setLegacyTypeName("VPN")

                .setBypassableVpn(mConfig.allowBypass && !mLockdown)

                .build();