commit f049071da45bec441813e29593e2bcd323a97bd0
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 9e9332056ce3abf910ea19f5bfcf9526c0c26604
parent 13156c7d07e0e1d839b5d54dfe0e983c4f7cb93f
parent dd494fb2f333efcbaa65b0d49e7ecbc87034fc76

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();
         }