commit 135c379115260f672fec023b0f9a020b8c51302b
author Hung-ying Tyan <tyanh@google.com> Fri Jul 31 02:57:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 02:57:19 2015 +0000
tree 84f51254c9ffc642dd5ae5e5fdc89d2697fc780f
parent 44718c4b8b3c7655ecc34981c8ee41e1daf34f00
parent 410abcdb41f5bca84574e7b07d3f022d5e05e4c9

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

* commit '410abcdb41f5bca84574e7b07d3f022d5e05e4c9':
  Revise lockdown check in getLegacyVpnInfo()

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 445d8ad..8ca5ac1 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3102,7 +3102,10 @@
     @Override
     public LegacyVpnInfo getLegacyVpnInfo(int userId) {
         enforceCrossUserPermission(userId);
-        throwIfLockdownEnabled();
+        if (mLockdownEnabled) {
+            return null;
+        }
+
         synchronized(mVpns) {
             return mVpns.get(userId).getLegacyVpnInfo();
         }