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

2016-05-25 21:05:53 +00:00 · 2016-05-25 21:05:53 +00:00 · ca9615bb20
commit ca9615bb20
parent d28e2363ed 08b036aebd
1 changed files with 0 additions and 3 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/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();