| commit | e1cdb63453cf5ea583d9efbe447f12247c62eac4 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Feb 26 04:16:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 04:16:21 2021 +0000 |
| tree | d6596635c757ec5348a061a68c2ca6e2b1dbfe5e | |
| parent | 82ba0376e5392bda81bc7340a1d13ca3ade0592a [diff] | |
| parent | c9ba0260a322f847da01b3cb380539455605559c [diff] |
Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
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); /**