From fc4f721a87e58c2955628adddcb7dcd441d3196f Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Mon, 25 Aug 2014 12:41:08 -0700 Subject: [PATCH] Update VPN whitelist/blacklist api docs. Addressing what happens to unwhitelisted or blacklisted apps. bug:17206162 Change-Id: I0b863946de277e6528675cc5412267a03f7b6841 --- core/java/android/net/VpnService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 99bccd0bfa996..b023b0ba8f23e 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -523,7 +523,8 @@ public class VpnService extends Service { * * If this method is called at least once, only applications added through this method (and * no others) are allowed access. Else (if this method is never called), all applications - * are allowed by default. + * are allowed by default. If some applications are added, other, un-added applications + * will use networking as if the VPN wasn't running. * * A {@link Builder} may have only a set of allowed applications OR a set of disallowed * ones, but not both. Calling this method after {@link #addDisallowedApplication} has @@ -548,7 +549,7 @@ public class VpnService extends Service { * Adds an application that's denied access to the VPN connection. * * By default, all applications are allowed access, except for those denied through this - * method. + * method. Denied applications will use networking as if the VPN wasn't running. * * A {@link Builder} may have only a set of allowed applications OR a set of disallowed * ones, but not both. Calling this method after {@link #addAllowedApplication} has already