diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-08-25 12:41:08 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2014-08-25 17:55:28 -0700 |
| commit | fc4f721a87e58c2955628adddcb7dcd441d3196f (patch) | |
| tree | de2ccfd92c8a224a3740812b5ed315f83eff3a4f /core/java/android/net/VpnService.java | |
| parent | ac0d62a1181bde3724f9a794cc4a96b2a4a90587 (diff) | |
| download | frameworks_base-fc4f721a87e58c2955628adddcb7dcd441d3196f.zip frameworks_base-fc4f721a87e58c2955628adddcb7dcd441d3196f.tar.gz frameworks_base-fc4f721a87e58c2955628adddcb7dcd441d3196f.tar.bz2 | |
Update VPN whitelist/blacklist api docs.
Addressing what happens to unwhitelisted or blacklisted apps.
bug:17206162
Change-Id: I0b863946de277e6528675cc5412267a03f7b6841
Diffstat (limited to 'core/java/android/net/VpnService.java')
| -rw-r--r-- | core/java/android/net/VpnService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 99bccd0..b023b0b 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 |