diff options
| author | 2023-08-04 07:22:10 +0000 | |
|---|---|---|
| committer | 2023-08-04 07:22:10 +0000 | |
| commit | a911e286f27e668d9e66b21e20d2447d4a03c6ba (patch) | |
| tree | 4a056201fd1d494957adccde545c198b5588fb23 | |
| parent | 3fd6c1609ef69833aa9889498c5018307f854b89 (diff) | |
| parent | f2daccaa4dee0832bc6ff58babc6a44e3e30c481 (diff) | |
Merge "Document limitations of the VpnService setHttpProxy API" into main am: 93c7b643d5 am: f2daccaa4d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678656
Change-Id: I403b7d90417b043b5a8a645ed7540f0fe3daaa0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/net/VpnService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 1ae1b050d32f..37bd67a4b883 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -537,8 +537,15 @@ public class VpnService extends Service { } /** - * Sets an HTTP proxy for the VPN network. This proxy is only a recommendation - * and it is possible that some apps will ignore it. PAC proxies are not supported. + * Sets an HTTP proxy for the VPN network. + * <p class="note">This proxy is only a recommendation and it is possible that some apps + * will ignore it. + * <p class="note">PAC proxies are not supported over VPNs. + * <p class="note">Apps that do use the proxy cannot distinguish between routes handled + * and not handled by the VPN and will try to access HTTP resources over the proxy + * regardless of the destination. In practice this means using a proxy with a split + * tunnel generally won't work as expected, because HTTP accesses on routes not handled by + * the VPN will not reach as the proxy won't be available outside of the VPN network. */ @NonNull public Builder setHttpProxy(@NonNull ProxyInfo proxyInfo) { |