diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-08-26 00:58:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-26 00:58:51 +0000 |
| commit | ad3fc407377597a23dd97cd92c72abaad1acca6c (patch) | |
| tree | 3eecbb7044c3c9a2c936f225c9d61a98737f13f9 /core/java/android | |
| parent | b2d21c21ccda7247281c2ae050c403d9c8971b52 (diff) | |
| parent | fc4f721a87e58c2955628adddcb7dcd441d3196f (diff) | |
| download | frameworks_base-ad3fc407377597a23dd97cd92c72abaad1acca6c.zip frameworks_base-ad3fc407377597a23dd97cd92c72abaad1acca6c.tar.gz frameworks_base-ad3fc407377597a23dd97cd92c72abaad1acca6c.tar.bz2 | |
Merge "Update VPN whitelist/blacklist api docs." into lmp-dev
Diffstat (limited to 'core/java/android')
| -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 |