summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaís Minchillo <laisminchillo@chromium.org>2018-10-12 10:36:11 +0000
committerCommit Bot <commit-bot@chromium.org>2018-10-12 10:36:11 +0000
commitf2ab640c32f909e680dca3c8e99ac9f6300302a5 (patch)
treed3d6a44ffaf1a13dac0f8bba2ba9920df73ebe1d
parent1d8eec5642ca1409e601b0be525dc54dbf411914 (diff)
downloadwebview_support_interfaces-f2ab640c32f909e680dca3c8e99ac9f6300302a5.tar.gz
[aw] Add callback to proxy override methods
Add an optional callback to proxy override methods introduced in change https://chromium-review.googlesource.com/c/chromium/src/+/1148384 This adds an optional callback developers can use to know when the changes have been made to the network settings, since the methods are not synchronous with the UI thread. Bug: 851995 Change-Id: I08dc7cc87c57d213b67774d3391562ca07fd0217 Reviewed-on: https://chromium-review.googlesource.com/c/1258770 Commit-Queue: Laís Minchillo <laisminchillo@chromium.org> Reviewed-by: Eric Roman <eroman@chromium.org> Reviewed-by: Richard Coles <torne@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#599166} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e2dd9b16afe9c2808aaa11566aa54fa854282db2
-rw-r--r--src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java4
-rw-r--r--src/org/chromium/support_lib_boundary/util/Features.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
index b3b5aac..5511b39 100644
--- a/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
@@ -17,6 +17,6 @@ public interface StaticsBoundaryInterface {
void initSafeBrowsing(Context context, ValueCallback<Boolean> callback);
void setSafeBrowsingWhitelist(List<String> hosts, ValueCallback<Boolean> callback);
Uri getSafeBrowsingPrivacyPolicyUrl();
- void setProxyOverride(String host, int port, String[] exclusionList);
- void clearProxyOverride();
+ void setProxyOverride(String host, int port, String[] exclusionList, Runnable callback);
+ void clearProxyOverride(Runnable callback);
}
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index 705e068..59ce1df 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -127,7 +127,7 @@ public class Features {
// WebViewCompat.setProxyOverride
// WebViewCompat.clearProxyOverride
- public static final String PROXY_OVERRIDE = "PROXY_OVERRIDE";
+ public static final String PROXY_OVERRIDE = "PROXY_OVERRIDE:2";
// WebViewCompat.getWebViewRenderer
public static final String GET_WEB_VIEW_RENDERER = "GET_WEB_VIEW_RENDERER";