| commit | 14b6af4431c80bd4c207a96afe1d7125138ddd70 | [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 | c22955210d6130b6efc6cd06885f056f42cad4b5 | |
| parent | 181827f86253063112ab2b918f724e64f78b9b07 [diff] | |
| parent | 0c04e41e7b2c8784629bab6599d70681a64aada9 [diff] |
Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b 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); /**