| commit | bb12b0df4107ad0a45d985e50317d7af52af758f | [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 | b9ca87b0916940fa451361890381fb73ec4956c3 | |
| parent | a898ed9daca34b55c4579e272a0592315762130e [diff] | |
| parent | e1cdb63453cf5ea583d9efbe447f12247c62eac4 [diff] |
Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3 am: e1cdb63453 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); /**