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

* commit 'f049071da45bec441813e29593e2bcd323a97bd0': Revise lockdown check in getLegacyVpnInfo()
2015-07-31 02:57:19 +00:00
parent 6995b9e586 f049071da4
commit dc7add287d
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();
        }