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

Commit 0d39a86c 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

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

Change-Id: I9e56e75c61d464128623cf35c34fc96fe9781ce0
parents 47968a9f a0576c61

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