summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSreeram Ramachandran <sreeram@google.com>2014-07-09 21:11:12 -0700
committerSreeram Ramachandran <sreeram@google.com>2014-07-10 21:33:58 +0000
commit633f0e875dd6bda31f575fe4bc0187e9f245403f (patch)
tree5177336aaa69164008905afe2ea8546cc91bb5b5 /api
parent1e2554b99719c95f8c4acdfc170e0d07f2815ed2 (diff)
downloadframeworks_base-633f0e875dd6bda31f575fe4bc0187e9f245403f.zip
frameworks_base-633f0e875dd6bda31f575fe4bc0187e9f245403f.tar.gz
frameworks_base-633f0e875dd6bda31f575fe4bc0187e9f245403f.tar.bz2
Let VpnService specify a white/black list of apps that are allowed access.
New API with stub implementation to be filled out later. Bug: 13651397 Change-Id: Ibabd6c22495ce58dc88142bb958c1ef12adcf78e
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 87bb6ae..2011043 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -852,7 +852,7 @@ package android {
field public static final int mirrorForRtl = 16843726; // 0x10103ce
field public static final int mode = 16843134; // 0x101017e
field public static final int moreIcon = 16843061; // 0x1010135
- field public static final int multiArch = 16843918; // 0x101048e
+ field public static final int multiArch = 16843919; // 0x101048f
field public static final int multiprocess = 16842771; // 0x1010013
field public static final int name = 16842755; // 0x1010003
field public static final int navigationBarColor = 16843860; // 0x1010454
@@ -16841,6 +16841,8 @@ package android.net {
ctor public VpnService.Builder();
method public android.net.VpnService.Builder addAddress(java.net.InetAddress, int);
method public android.net.VpnService.Builder addAddress(java.lang.String, int);
+ method public android.net.VpnService.Builder addAllowedApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.net.VpnService.Builder addDisallowedApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
method public android.net.VpnService.Builder addDnsServer(java.net.InetAddress);
method public android.net.VpnService.Builder addDnsServer(java.lang.String);
method public android.net.VpnService.Builder addRoute(java.net.InetAddress, int);