commit dc67971a996c447c71ceb9ad983c79c96f598bcc
author Robin Lee <rgl@google.com> Tue May 03 13:23:03 2016 +0100
committer Robin Lee <rgl@google.com> Tue May 03 13:24:42 2016 +0100
tree c8339a423cceec8b6cfde32505b13b891b3223cd
parent 7544ac22e474547a3cbeaff0dcaf163bbbd4fca7

Add lockdownEnabled parameter to always-on VPN API

Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d85827e..100ada8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3309,7 +3309,7 @@
     }
 
     @Override
-    public boolean setAlwaysOnVpnPackage(int userId, String packageName) {
+    public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdown) {
         enforceConnectivityInternalPermission();
         enforceCrossUserPermission(userId);