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

Commit 25a7767c authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add public alternative for protectFromVpn" am: 2c49d21c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14
parents 5383d7a7 2c49d21c

packages/Connectivity/framework/src/android/net/NetworkUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ public class NetworkUtils { 
     * this socket will go directly to the underlying network, so its traffic will not be

     * forwarded through the VPN.

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553,

            publicAlternatives = "Use {@link android.net.VpnService#protect} instead.")

    public static native boolean protectFromVpn(FileDescriptor fd);



    /**