Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev

Browse Source 
* commit '51cfb3a4d6f59824ba503a0e7f0190e08ede8621':
  Legacy VPN calls to require a userID
This commit is contained in:
Robin Lee
2015-07-10 19:47:12 +00:00
committed by Android Git Automerger
parent c10176a419 51cfb3a4d6
commit 81093dd04b
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();
}
}