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

am 2164cf4f: am 718df19e: Merge "Legacy VPN calls to require a userID" into mnc-dev

Browse Source 
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID
This commit is contained in:
Robin Lee
2015-07-10 19:35:39 +00:00
committed by Android Git Automerger
parent 79661f9187 718df19ed0
commit 1fdce40a96
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -112,7 +112,7 @@ interface IConnectivityManager
void startLegacyVpn(in VpnProfile profile);
LegacyVpnInfo getLegacyVpnInfo();
LegacyVpnInfo getLegacyVpnInfo(int userId);
VpnInfo[] getAllVpnInfo();

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

@@ -3085,11 +3085,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
* are checked in Vpn class.
*/
@Override
public LegacyVpnInfo getLegacyVpnInfo() {
public LegacyVpnInfo getLegacyVpnInfo(int userId) {
enforceCrossUserPermission(userId);
throwIfLockdownEnabled();
int user = UserHandle.getUserId(Binder.getCallingUid());
synchronized(mVpns) {
return mVpns.get(user).getLegacyVpnInfo();
return mVpns.get(userId).getLegacyVpnInfo();
}
}