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

Commit 62f3b928 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4f 

am: ef7e644f

* commit 'ef7e644f':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
parents c9eb2c47 ef7e644f

services/core/java/com/android/server/ConnectivityService.java

+0 −3
Original line number Diff line number Diff line
@@ -3228,9 +3228,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    public LegacyVpnInfo getLegacyVpnInfo(int userId) {

        enforceCrossUserPermission(userId);

        if (mLockdownEnabled) {

            return null;

        }



        synchronized(mVpns) {

            return mVpns.get(userId).getLegacyVpnInfo();