| commit | fb559351e4dc5edf4940aa99e7d74d44452403bc | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Mon Mar 01 08:01:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 08:01:51 2021 +0000 |
| tree | 73fc8f093089f80e0b7aecc4625b1d373773c843 | |
| parent | 40435af9f710c4415104daf28d33a94cedcd3a7e [diff] | |
| parent | 14b6af4431c80bd4c207a96afe1d7125138ddd70 [diff] |
Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b am: 14b6af4431 am: e456ac2061 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
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); /**