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

Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."" am: 3ea732de43 am: b5fb9726b7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2188655

Change-Id: I49ace854e3a404ec8c3ba6280316f149f17c599a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Lin
2022-08-25 06:39:22 +00:00
committed by Automerger Merge Worker
parent e9a59c6013 b5fb9726b7
commit c9531fa6c6
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1110,7 +1110,7 @@ public class Vpn {
// Except for Settings and VpnDialogs, the caller should be matched one of oldPackage or // Except for Settings and VpnDialogs, the caller should be matched one of oldPackage or
// newPackage. Otherwise, non VPN owner might get the VPN always-on status of the VPN owner. // newPackage. Otherwise, non VPN owner might get the VPN always-on status of the VPN owner.
// See b/191382886. // See b/191382886.
if (!hasControlVpnPermission()) { if (mContext.checkCallingOrSelfPermission(CONTROL_VPN) != PERMISSION_GRANTED) {
if (oldPackage != null) { if (oldPackage != null) {
verifyCallingUidAndPackage(oldPackage); verifyCallingUidAndPackage(oldPackage);
} }
@@ -2073,10 +2073,6 @@ public class Vpn {
"Unauthorized Caller"); "Unauthorized Caller");
} }
private boolean hasControlVpnPermission() {
return mContext.checkCallingOrSelfPermission(CONTROL_VPN) == PERMISSION_GRANTED;
}
private class Connection implements ServiceConnection { private class Connection implements ServiceConnection {
private IBinder mService; private IBinder mService;
@@ -3901,10 +3897,8 @@ public class Vpn {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }
// If package has CONTROL_VPN, grant the ACTIVATE_PLATFORM_VPN appop. // TODO: if package has CONTROL_VPN, grant the ACTIVATE_PLATFORM_VPN appop.
if (hasControlVpnPermission()) { // This mirrors the prepareAndAuthorize that is used by VpnService.
setPackageAuthorization(packageName, VpnManager.TYPE_VPN_PLATFORM);
}
// Return whether the app is already pre-consented // Return whether the app is already pre-consented
return isVpnProfilePreConsented(mContext, packageName); return isVpnProfilePreConsented(mContext, packageName);