commit 2f3d6bc5932027ec425d1cf0fbdac06aac85455b
author Chalard Jean <jchalard@google.com> Thu Jul 15 06:59:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 15 06:59:58 2021 +0000
tree 4744a9e76ffe18a3fb7f64b4e4e9b30f0627a5f6
parent f5c3de0dbdd5a6b6b5c164ef6d159fd87632f756
parent 3eac2ebe4dcad44dadecec953571adff6c13f1ae

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

core/java/android/net/VpnService.java

diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
index fa3ff8a..2ced056 100644
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -529,7 +529,7 @@
 
         /**
          * 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) {