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

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

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

Change-Id: Icc8867a0ea3024c189aff10e2b903fac0dab2092
parents c9eb2c47 30c63961

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