diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-09-11 21:39:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 21:39:08 +0000 |
commit | 623ce7f779b4cce2c6d74b0cab41a90d79afe9b2 (patch) | |
tree | 6cb4e797d2eca93af7d31ac3b7aaf894078890ef /api | |
parent | 6f90967b0c1d6958b88fd131d938e9f739bba16b (diff) | |
parent | a1e06807eeb6587c3ea12778440226977d63b064 (diff) | |
download | frameworks_base-623ce7f779b4cce2c6d74b0cab41a90d79afe9b2.zip frameworks_base-623ce7f779b4cce2c6d74b0cab41a90d79afe9b2.tar.gz frameworks_base-623ce7f779b4cce2c6d74b0cab41a90d79afe9b2.tar.bz2 |
Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a0a06ab..b06951f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17537,14 +17537,12 @@ package android.net { public class VpnService extends android.app.Service { ctor public VpnService(); - method public boolean addAddress(java.net.InetAddress, int); method public android.os.IBinder onBind(android.content.Intent); method public void onRevoke(); method public static android.content.Intent prepare(android.content.Context); method public boolean protect(int); method public boolean protect(java.net.Socket); method public boolean protect(java.net.DatagramSocket); - method public boolean removeAddress(java.net.InetAddress, int); field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService"; } |