summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/current.txt21
-rw-r--r--core/java/android/net/VpnBuilder.java1
-rw-r--r--core/res/AndroidManifest.xml3
3 files changed, 22 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 543c8bb..4b63c5b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -117,6 +117,7 @@ package android {
field public static final java.lang.String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS";
field public static final java.lang.String USE_SIP = "android.permission.USE_SIP";
field public static final java.lang.String VIBRATE = "android.permission.VIBRATE";
+ field public static final java.lang.String VPN = "android.permission.VPN";
field public static final java.lang.String WAKE_LOCK = "android.permission.WAKE_LOCK";
field public static final java.lang.String WRITE_APN_SETTINGS = "android.permission.WRITE_APN_SETTINGS";
field public static final java.lang.String WRITE_CALENDAR = "android.permission.WRITE_CALENDAR";
@@ -11445,6 +11446,26 @@ package android.net {
method public abstract java.lang.String sanitize(java.lang.String);
}
+ public class VpnBuilder {
+ ctor public VpnBuilder();
+ method public android.net.VpnBuilder addAddress(java.lang.String, int);
+ method public android.net.VpnBuilder addAddress(java.net.InetAddress, int);
+ method public android.net.VpnBuilder addDnsServer(java.lang.String);
+ method public android.net.VpnBuilder addDnsServer(java.net.InetAddress);
+ method public android.net.VpnBuilder addRoute(java.lang.String, int);
+ method public android.net.VpnBuilder addRoute(java.net.InetAddress, int);
+ method public android.net.VpnBuilder addSearchDomain(java.lang.String);
+ method public android.os.ParcelFileDescriptor establish();
+ method public static android.content.Intent prepare(android.content.Context);
+ method public static boolean protect(int);
+ method public static boolean protect(java.net.Socket);
+ method public static boolean protect(java.net.DatagramSocket);
+ method public android.net.VpnBuilder setConfigureIntent(android.app.PendingIntent);
+ method public android.net.VpnBuilder setMtu(int);
+ method public android.net.VpnBuilder setSession(java.lang.String);
+ field public static final java.lang.String ACTION_VPN_REVOKED = "android.net.vpn.action.REVOKED";
+ }
+
}
package android.net.http {
diff --git a/core/java/android/net/VpnBuilder.java b/core/java/android/net/VpnBuilder.java
index 4582523..25cedb6 100644
--- a/core/java/android/net/VpnBuilder.java
+++ b/core/java/android/net/VpnBuilder.java
@@ -91,7 +91,6 @@ import java.util.ArrayList;
*
* <p class="note">Using this class requires
* {@link android.Manifest.permission#VPN} permission.
- * @hide
*/
public class VpnBuilder {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 91003d1..92ba1d0 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -393,8 +393,7 @@
android:description="@string/permdesc_nfc"
android:label="@string/permlab_nfc" />
- <!-- Allows applications to provide VPN functionality.
- @hide Pending API council approval -->
+ <!-- Allows applications to provide VPN functionality -->
<permission android:name="android.permission.VPN"
android:permissionGroup="android.permission-group.NETWORK"
android:protectionLevel="dangerous"