joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests 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
commit d7208c5c4a
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
public LegacyVpnInfo getLegacyVpnInfo(int userId) {
enforceCrossUserPermission(userId);
throwIfLockdownEnabled();
if (mLockdownEnabled) {
return null;
}
synchronized(mVpns) {
return mVpns.get(userId).getLegacyVpnInfo();
}