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

* commit 'ce009dd42678c83473ccc34a527d2f796391d8b2': Revise lockdown check in getLegacyVpnInfo()
2015-07-31 03:04:41 +00:00
parent 89006358b3 ce009dd426
commit 02e4bae335
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();
        }