commit 44c8c5ccaf1dfb5e059732c05e00e6891cb65f71
author Hung-ying Tyan <tyanh@google.com> Wed Jul 29 12:39:21 2015 +0800
committer Hung-ying Tyan <tyanh@google.com> Thu Jul 30 10:52:25 2015 +0800
tree b4fbd69144a11fa00adbf509b1898677836211b8
parent b8040265dd0d5a2a96e0850623647dad2f528db1

Revise lockdown check in getLegacyVpnInfo()

Return null instead of raising exception in lockdown mode.

BUG=22749146

Change-Id: I0e9e3ded0d189e3fa9e872b7af9fe363799c85d6

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 76d2258..a79e5b1 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();
         }