diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-07-10 21:44:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-10 20:54:59 +0000 |
commit | 482edab3abdb3c66d99008c573f0b9fd679ea31a (patch) | |
tree | f622e1b30e33097ff866705c7f3738e3dc55e0ad /api | |
parent | 1d599da8424cef8d07cb4c533bd212d992d8f676 (diff) | |
parent | a9294eb1c9c090f5c896c0212efed0234678d970 (diff) | |
download | frameworks_base-482edab3abdb3c66d99008c573f0b9fd679ea31a.zip frameworks_base-482edab3abdb3c66d99008c573f0b9fd679ea31a.tar.gz frameworks_base-482edab3abdb3c66d99008c573f0b9fd679ea31a.tar.bz2 |
Merge "Allow a VPN to be declared bypassable."
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 38e0320..0d67271 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16850,6 +16850,7 @@ package android.net { method public android.net.VpnService.Builder addRoute(java.net.InetAddress, int); method public android.net.VpnService.Builder addRoute(java.lang.String, int); method public android.net.VpnService.Builder addSearchDomain(java.lang.String); + method public android.net.VpnService.Builder allowBypass(); method public android.net.VpnService.Builder allowFamily(int); method public android.os.ParcelFileDescriptor establish(); method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent); |