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 am: 4fb4490dfb

Browse Source 
am: ef7e644fc5

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

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
This commit is contained in:
Robin Lee
2016-05-25 21:28:27 +00:00
committed by android-build-merger
parent 8e401c2437 4fb4490dfb
commit 3b693c82ad
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();