Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 411b0497 authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Document limitations of the VpnService setHttpProxy API" into main am:... 

Merge "Document limitations of the VpnService setHttpProxy API" into main am: 93c7b643 am: f2daccaa am: a911e286 am: 24adac99

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678656



Change-Id: Iad46955c519b6a79abdd0c07dab7a7081fb882b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42228094 24adac99

core/java/android/net/VpnService.java

+9 −2
Original line number Diff line number Diff line
@@ -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) {