diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2015-07-31 02:51:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 02:51:32 +0000 |
| commit | 410abcdb41f5bca84574e7b07d3f022d5e05e4c9 (patch) | |
| tree | 6ad434a7e18eca5110a53e9760e7c1458f3a2a61 /services/core/java/com/android/server/ConnectivityService.java | |
| parent | bbb47d88d5f129ab1ca30d6a7a41976e47681e37 (diff) | |
| parent | 44c8c5ccaf1dfb5e059732c05e00e6891cb65f71 (diff) | |
| download | frameworks_base-410abcdb41f5bca84574e7b07d3f022d5e05e4c9.zip frameworks_base-410abcdb41f5bca84574e7b07d3f022d5e05e4c9.tar.gz frameworks_base-410abcdb41f5bca84574e7b07d3f022d5e05e4c9.tar.bz2 | |
Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ 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(); } |