LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages 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
parent 4ab39690aa 35ca2e7768
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); void startLegacyVpn(in VpnProfile profile);
LegacyVpnInfo getLegacyVpnInfo(); LegacyVpnInfo getLegacyVpnInfo(int userId);
VpnInfo[] getAllVpnInfo(); 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. * are checked in Vpn class.
*/ */
@Override @Override
public LegacyVpnInfo getLegacyVpnInfo() { public LegacyVpnInfo getLegacyVpnInfo(int userId) {
enforceCrossUserPermission(userId);
throwIfLockdownEnabled(); throwIfLockdownEnabled();
int user = UserHandle.getUserId(Binder.getCallingUid());
synchronized(mVpns) { synchronized(mVpns) {
return mVpns.get(user).getLegacyVpnInfo(); return mVpns.get(userId).getLegacyVpnInfo();
} }
} }