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

Commit 067e753a authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

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

am: 0d39a86c

* commit '0d39a86c':
  Disallow prepare()-ing over an always on VPN app

Change-Id: I1ba26cd898f6670e5e287f31353a1dc88f690a25
parents 37f765e9 0d39a86c

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

+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);