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

* commit 'd7208c5c4a4ec14208b46b35aa6a859315716c48': Revise lockdown check in getLegacyVpnInfo()
2015-07-31 02:57:19 +00:00
parent 225466b363 d7208c5c4a
commit ce009dd426
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
@@ -3102,7 +3102,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();
        }