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

Commit 30c63961 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

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

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
parents 48d08caa 48b18f4f

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