Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44dabe3d authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "Revert "Unhide APIs for user space VPN.""

parents a7edc40f e1538f05

api/current.txt

+0 −21
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ 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";
@@ -11478,26 +11477,6 @@ 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 {

























core/java/android/net/VpnBuilder.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -91,6 +91,7 @@ import java.util.ArrayList;













 *















 * <p class="note">Using this class requires















 * {@link android.Manifest.permission#VPN} permission.













 * @hide















 */















public class VpnBuilder {

















































core/res/AndroidManifest.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -393,7 +393,8 @@













        android:description="@string/permdesc_nfc"















        android:label="@string/permlab_nfc" />





























    <!-- Allows applications to provide VPN functionality -->













    <!-- Allows applications to provide VPN functionality.













         @hide Pending API council approval -->















    <permission android:name="android.permission.VPN"















        android:permissionGroup="android.permission-group.NETWORK"















        android:protectionLevel="dangerous"