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

Unhide APIs for user space VPN.

Browse Source 
Change-Id: I6f9ddb3fffe9e10cc2d34dda3ae8700b1af7e470
This commit is contained in:
Chia-chi Yeh
2011-08-08 18:26:28 -07:00
parent 89c95a0da8
commit d0d85f26cb
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/current.txt
View File

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

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

@@ -101,7 +101,6 @@ import java.util.ArrayList;
* &lt;/service&gt;</pre>
*
* @see Builder
* @hide
*/
public class VpnService extends Service {

3
core/res/AndroidManifest.xml
View File

@@ -1117,8 +1117,7 @@
android:protectionLevel="signature" />
<!-- Must be required by an {@link android.net.VpnService},
to ensure that only the system can bind to it.
@hide -->
to ensure that only the system can bind to it. -->
<permission android:name="android.permission.BIND_VPN_SERVICE"
android:label="@string/permlab_bindVpnService"
android:description="@string/permdesc_bindVpnService"