From 2543ed879972709055bbbcdc5c54730b08b6a766 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Tue, 17 May 2016 14:29:57 +0100 Subject: [PATCH] Return legacy VPN info regardless of lockdown mode This stops Settings from telling the user detailed information, and doesn't really protect anything secret -- privileged apps can already tell that there's an active VPN by looking at network info. Change-Id: I9c2a3cab6dff1b62e94a9e0735dccde226fd26a3 Fix: 28624328 --- services/core/java/com/android/server/ConnectivityService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 8763b93f31..3adca72249 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3229,9 +3229,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();