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

2016-04-06 19:12:42 +00:00
parent f583427b0d 1b1bcd7b73
commit a0576c61d8
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -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);