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

Commit a0576c61 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Disallow prepare()-ing over an always on VPN app" into nyc-dev

parents f583427b 1b1bcd7b
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -264,7 +264,12 @@ public class Vpn {
            return true;
        }

        // Check if the caller is authorized.
        // Stop an existing always-on VPN from being dethroned by other apps.
        if (getAlwaysOnPackage() != null) {
            return false;
        }

        // Check that the caller is authorized.
        enforceControlPermission();

        prepareInternal(newPackage);