LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
This commit is contained in:
Remi NGUYEN VAN
2021-02-26 04:16:21 +00:00
committed by Automerger Merge Worker
parent 82ba0376e5 c9ba0260a3
commit e1cdb63453
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/android/net/NetworkUtils.java
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);
/** /**