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 "Legacy VPN calls to require a userID" into mnc-dev

Browse source
This commit is contained in:
Robin Lee 2015-07-10 19:05:36 +00:00 • committed by Android (Google) Code Review
commit 718df19ed0
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

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