Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 48b18f4fa9

* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
  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 48d08caa30 48b18f4fa9
commit 30c63961dd
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();