diff options
| author | 2021-02-26 03:22:03 +0000 | |
|---|---|---|
| committer | 2021-02-26 03:22:03 +0000 | |
| commit | 25a7767cc70df76a458aa1d0df13b0ed423a38ea (patch) | |
| tree | 82f49e45b73d05109ab93ae1d5647518cca3e397 | |
| parent | 5383d7a7767e9c67a75da9eb2f9ed1195075bea0 (diff) | |
| parent | 2c49d21ce1b21d1d00eb9cf0df703126208f0286 (diff) | |
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I759af534bdf50f647351056275857c056998bf14
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Connectivity/framework/src/android/net/NetworkUtils.java b/packages/Connectivity/framework/src/android/net/NetworkUtils.java index 9ccb04a44af4..b5e8a614b8ea 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkUtils.java +++ b/packages/Connectivity/framework/src/android/net/NetworkUtils.java @@ -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); /** |