commit 4fb4490dfbf6366813ba7f78acba705f00e21a81
author Robin Lee <rgl@google.com> Wed May 25 21:05:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 21:05:55 2016 +0000
tree 59558f3a0a82c784d763828adc3d16f10fd03bb0
parent 3e0e975a38688b4d5dbc96830788df00499fc01b
parent 2543ed879972709055bbbcdc5c54730b08b6a766

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

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 2f2d8a4..5118b3f 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3228,9 +3228,6 @@
     @Override
     public LegacyVpnInfo getLegacyVpnInfo(int userId) {
         enforceCrossUserPermission(userId);
-        if (mLockdownEnabled) {
-            return null;
-        }
 
         synchronized(mVpns) {
             return mVpns.get(userId).getLegacyVpnInfo();