diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-08-08 18:26:28 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-08-08 18:26:28 -0700 |
| commit | d0d85f26cb7287c63adf95bace098bc1af3fe4e8 (patch) | |
| tree | a43d8db5ca952a0da3095a1cff0a22bc95308533 /api | |
| parent | 89c95a0da87fc85a86a7341f60decf7e50609a18 (diff) | |
| download | frameworks_base-d0d85f26cb7287c63adf95bace098bc1af3fe4e8.zip frameworks_base-d0d85f26cb7287c63adf95bace098bc1af3fe4e8.tar.gz frameworks_base-d0d85f26cb7287c63adf95bace098bc1af3fe4e8.tar.bz2 | |
Unhide APIs for user space VPN.
Change-Id: I6f9ddb3fffe9e10cc2d34dda3ae8700b1af7e470
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 73fe3b2..3e6b6bc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23,6 +23,7 @@ package android { field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; + field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER"; field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH"; field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN"; @@ -11663,6 +11664,32 @@ package android.net { method public abstract java.lang.String sanitize(java.lang.String); } + public class VpnService extends android.app.Service { + ctor public VpnService(); + 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); + field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService"; + } + + public class VpnService.Builder { + 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 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); + method public android.net.VpnService.Builder addRoute(java.lang.String, int); + method public android.net.VpnService.Builder addSearchDomain(java.lang.String); + method public android.os.ParcelFileDescriptor establish(); + method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent); + method public android.net.VpnService.Builder setMtu(int); + method public android.net.VpnService.Builder setSession(java.lang.String); + } + } package android.net.http { |