am dc7add28: am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit 'dc7add287de5ef1e7c96596924bf73ee2d1c0f5d': Revise lockdown check in getLegacyVpnInfo()
2015-07-31 03:04:41 +00:00
parent 9a846179b7 dc7add287d
commit 6a9f6f6738
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3109,7 +3109,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
    @Override
    public LegacyVpnInfo getLegacyVpnInfo(int userId) {
        enforceCrossUserPermission(userId);
-        throwIfLockdownEnabled();
+        if (mLockdownEnabled) {
+            return null;
+        }
+
        synchronized(mVpns) {
            return mVpns.get(userId).getLegacyVpnInfo();
        }