commit 410abcdb41f5bca84574e7b07d3f022d5e05e4c9
author Hung-ying Tyan <tyanh@google.com> Fri Jul 31 02:51:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 31 02:51:32 2015 +0000
tree 6ad434a7e18eca5110a53e9760e7c1458f3a2a61
parent bbb47d88d5f129ab1ca30d6a7a41976e47681e37
parent 44c8c5ccaf1dfb5e059732c05e00e6891cb65f71

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

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 da94532..6a22f22 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3048,7 +3048,10 @@
     @Override
     public LegacyVpnInfo getLegacyVpnInfo(int userId) {
         enforceCrossUserPermission(userId);
-        throwIfLockdownEnabled();
+        if (mLockdownEnabled) {
+            return null;
+        }
+
         synchronized(mVpns) {
             return mVpns.get(userId).getLegacyVpnInfo();
         }