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

Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464c3 am: 2cb4db028b

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

Change-Id: Ia93b2ba5d0dfe672f8dba50f2537ba069069b642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cassie Wang
2023-06-19 12:47:39 +00:00
committed by Automerger Merge Worker
parent afea93413f 2cb4db028b
commit c2c813491f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1389,7 +1389,7 @@ public class Vpn {
}
// Check that the caller is authorized.
enforceControlPermission();
enforceControlPermissionOrInternalCaller();
// Stop an existing always-on VPN from being dethroned by other apps.
if (mAlwaysOn && !isCurrentPreparedPackage(newPackage)) {