Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update VPN whitelist/blacklist api docs." into lmp-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-08-26 00:58:49 +00:00
committed by Android (Google) Code Review
parent b2d21c21cc fc4f721a87
commit ad3fc40737
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/VpnService.java
View File

@@ -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