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

am dc7add28: am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

Browse Source 
* commit 'dc7add287de5ef1e7c96596924bf73ee2d1c0f5d':
  Revise lockdown check in getLegacyVpnInfo()
This commit is contained in:
Hung-ying Tyan
2015-07-31 03:04:41 +00:00
committed by Android Git Automerger
parent 9a846179b7 dc7add287d
commit 6a9f6f6738
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

@@ -3109,7 +3109,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();
} }