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

am: b8a5f360e3

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

Change-Id: Icc8867a0ea3024c189aff10e2b903fac0dab2092

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

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