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

Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

Browse Source
This commit is contained in:
Hung-ying Tyan
2015-07-31 02:51:32 +00:00
committed by Android (Google) Code Review
parent 13156c7d07 dd494fb2f3
commit f049071da4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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