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

Commit 5e632221 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 am: 1018b65c am: 79a06b69 am: fdc8620d

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



Change-Id: I1c70bb50677b1a526b34319c435652083b955130
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdb32e3a fdc8620d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1389,7 +1389,7 @@ public class Vpn { 
        }

        }





        // Check that the caller is authorized.

        // Check that the caller is authorized.

        enforceControlPermission();

        enforceControlPermissionOrInternalCaller();





        // Stop an existing always-on VPN from being dethroned by other apps.

        // Stop an existing always-on VPN from being dethroned by other apps.

        if (mAlwaysOn && !isCurrentPreparedPackage(newPackage)) {

        if (mAlwaysOn && !isCurrentPreparedPackage(newPackage)) {