Merge "Add public alternative for protectFromVpn"

This commit is contained in:
Remi NGUYEN VAN
2021-02-26 01:50:32 +00:00
committed by Gerrit Code Review

View File

@@ -91,7 +91,8 @@ public class NetworkUtils {
* this socket will go directly to the underlying network, so its traffic will not be * this socket will go directly to the underlying network, so its traffic will not be
* forwarded through the VPN. * 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); public static native boolean protectFromVpn(FileDescriptor fd);
/** /**