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

Commit 6bc0f4d0 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Add doc explaining PAC proxies are not supported over VPNs" am:... 

Merge "Add doc explaining PAC proxies are not supported over VPNs" am: 2f3d6bc5 am: 75e9f080 am: 452aed7c

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

Change-Id: Ie9d3de762f58f6530be2da05bacc47e47509696f
parents 5397cce4 452aed7c

core/java/android/net/VpnService.java

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 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.

         * and it is possible that some apps will ignore it. PAC proxies are not supported.

         */

        @NonNull

        public Builder setHttpProxy(@NonNull ProxyInfo proxyInfo) {