| commit | 5cb7ff8c8efd1ffe57549f6325459e07ac7bb31b | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Feb 26 03:22:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 03:22:03 2021 +0000 |
| tree | d6596635c757ec5348a061a68c2ca6e2b1dbfe5e | |
| parent | 1636f85cab12d0130a55481dac88c97ffff87d47 [diff] | |
| parent | cc595f8d175c97d3d8ca83dd49e206a643a80e68 [diff] |
Merge "Add public alternative for protectFromVpn" am: cc595f8d17 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I759af534bdf50f647351056275857c056998bf14
diff --git a/framework/src/android/net/NetworkUtils.java b/framework/src/android/net/NetworkUtils.java index 9ccb04a..b5e8a61 100644 --- a/framework/src/android/net/NetworkUtils.java +++ b/framework/src/android/net/NetworkUtils.java
@@ -91,7 +91,8 @@ * 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); /**