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

Commit 25818eb0 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Set legacy type for VPN" into sc-dev am: e1b6e11c 

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

Change-Id: I770fd8caac21646e7f91980dc3e0162bb3ad81b4
parents b6d92578 e1b6e11c

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();