LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev

Browse Source 
am: 4fb4490dfb

* commit '4fb4490dfbf6366813ba7f78acba705f00e21a81':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
This commit is contained in:
Robin Lee
2016-05-25 21:20:43 +00:00
committed by android-build-merger
parent 8d5d9a0ff4 4fb4490dfb
commit 624febb525
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3228,9 +3228,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
public LegacyVpnInfo getLegacyVpnInfo(int userId) { public LegacyVpnInfo getLegacyVpnInfo(int userId) {
enforceCrossUserPermission(userId); enforceCrossUserPermission(userId);
if (mLockdownEnabled) {
return null;
}
synchronized(mVpns) { synchronized(mVpns) {
return mVpns.get(userId).getLegacyVpnInfo(); return mVpns.get(userId).getLegacyVpnInfo();