am 058fbd0f: am 4581ca53: am 7b2b74e1: am dc7add28: am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit '058fbd0fef35e62d2baf3e58b7a0c2f24b155dff': Revise lockdown check in getLegacyVpnInfo()
2015-07-31 03:23:43 +00:00
parent 841092d2a2 dc7add287d
commit 2604fa162f
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();
        }