summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2021-07-15 06:59:58 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-07-15 06:59:58 +0000
commit2f3d6bc5932027ec425d1cf0fbdac06aac85455b (patch)
tree4744a9e76ffe18a3fb7f64b4e4e9b30f0627a5f6
parentf5c3de0dbdd5a6b6b5c164ef6d159fd87632f756 (diff)
parent3eac2ebe4dcad44dadecec953571adff6c13f1ae (diff)
Merge "Add doc explaining PAC proxies are not supported over VPNs"
-rw-r--r--core/java/android/net/VpnService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
index fa3ff8a26862..2ced05693755 100644
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -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) {