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

Commit 478b2b7c authored by Charles He's avatar Charles He Committed by android-build-merger
Browse files

Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev am: 8b2513e4 

am: 337ee077

Change-Id: Ib4eca8d5ea79e5ac65496bee8390e5ce4cd8fb64
parents c8a1b95c 337ee077

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26064,8 +26064,8 @@ package android.net { 
    method public boolean protect(java.net.Socket);

    method public boolean protect(java.net.DatagramSocket);

    method public boolean setUnderlyingNetworks(android.net.Network[]);

    field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";

    field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";

    field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";

  }















  public class VpnService.Builder {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -28363,8 +28363,8 @@ package android.net {













    method public boolean protect(java.net.Socket);















    method public boolean protect(java.net.DatagramSocket);















    method public boolean setUnderlyingNetworks(android.net.Network[]);













    field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";















    field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";













    field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";















  }





























  public class VpnService.Builder {

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -26208,8 +26208,8 @@ package android.net {













    method public boolean protect(java.net.Socket);















    method public boolean protect(java.net.DatagramSocket);















    method public boolean setUnderlyingNetworks(android.net.Network[]);













    field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";















    field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";













    field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";















  }





























  public class VpnService.Builder {

























core/java/android/app/admin/DevicePolicyManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -3939,7 +3939,7 @@ public class DevicePolicyManager {













     *         {@link android.Manifest.permission#BIND_VPN_SERVICE};</li>















     *     <li>target {@link android.os.Build.VERSION_CODES#N API 24} or above; and</li>















     *     <li><i>not</i> explicitly opt out of the feature through













     *         {@link android.net.VpnService#METADATA_SUPPORTS_ALWAYS_ON}.</li>













     *         {@link android.net.VpnService#SERVICE_META_DATA_SUPPORTS_ALWAYS_ON}.</li>















     * </ul>















     * The call will fail if called with the package name of an unsupported VPN app.















     *

































core/java/android/net/ConnectivityManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -840,8 +840,8 @@ public class ConnectivityManager {













     * In order to support the always-on feature, an app has to















     * <ul>















     *     <li>target {@link VERSION_CODES#N API 24} or above, and













     *     <li>not opt out through the {@link VpnService#METADATA_SUPPORTS_ALWAYS_ON} meta-data













     *         field.













     *     <li>not opt out through the {@link VpnService#SERVICE_META_DATA_SUPPORTS_ALWAYS_ON}













     *         meta-data field.















     * </ul>















     *















     * @param userId The identifier of the user for whom the VPN app is installed.