Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1018b65c authored by Cassie Wang's avatar Cassie Wang Committed by Automerger Merge Worker
Browse files

Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am:... 

Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464 am: 2cb4db02 am: c2c81349

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



Change-Id: Ie0e76bea9a555331a3f51d9fef9dbada8e50a314
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 672d30a3 c2c81349

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -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)) {