summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaís Minchillo <laisminchillo@google.com>2021-01-12 14:56:27 +0000
committerLaís Minchillo <laisminchillo@google.com>2021-01-12 14:56:27 +0000
commit5516718e014d098392958691c8e77badb3bc27a4 (patch)
tree81beccf140e1ef12ed826670c0d154152511af67
parent021571f9ab2fb3cf7c162fa43f2a6329dcda89b4 (diff)
parentd3ef8e8509499dd3eb8c0b7c1f5fdeb6f767f104 (diff)
downloadwebview_support_interfaces-androidx-leanback-release.tar.gz
[AndroidX Webkit] roll boundary interfaces to d3ef8e8androidx-leanback-release
This rolls the boundary interfaces for the androidx.webkit module to include the following commit range: https://android.googlesource.com/platform/external/webview_support_interfaces/+log/021571f9ab2fb3cf7c162fa43f2a6329dcda89b4..d3ef8e8509499dd3eb8c0b7c1f5fdeb6f767f104 Test: N/A Change-Id: I60c893a1c9473c2a7b23f5448dff740a394b0642
-rw-r--r--src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java2
-rw-r--r--src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java1
-rw-r--r--src/org/chromium/support_lib_boundary/util/Features.java3
3 files changed, 6 insertions, 0 deletions
diff --git a/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
index f9abc59..07888ef 100644
--- a/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
@@ -12,5 +12,7 @@ import java.util.concurrent.Executor;
public interface ProxyControllerBoundaryInterface {
void setProxyOverride(
String[][] proxyRules, String[] bypassRules, Runnable listener, Executor executor);
+ void setProxyOverride(String[][] proxyRules, String[] bypassRules, Runnable listener,
+ Executor executor, boolean reverseBypass);
void clearProxyOverride(Runnable listener, Executor executor);
}
diff --git a/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
index c2dc613..0be05d2 100644
--- a/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
+++ b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
@@ -132,6 +132,7 @@ public class BoundaryInterfaceReflectionUtil {
* @param invocationHandler a {@link Nullable} InvocationHandlerWithDelegateGetter.
* @return the corresponding delegate.
*/
+ @RequiresApi(Build.VERSION_CODES.KITKAT)
@Nullable
public static Object getDelegateFromInvocationHandler(
@Nullable InvocationHandler invocationHandler) {
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index d3a5039..b2f55e1 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -135,6 +135,9 @@ public class Features {
// ProxyController.clearProxyOverride
public static final String PROXY_OVERRIDE = "PROXY_OVERRIDE:3";
+ // ProxyController.setProxyOverride
+ public static final String PROXY_OVERRIDE_REVERSE_BYPASS = "PROXY_OVERRIDE_REVERSE_BYPASS";
+
// WebSettingsCompat.setWillSuppressErrorPage
// WebSettingsCompat.getWillSuppressErrorPage
public static final String SUPPRESS_ERROR_PAGE = "SUPPRESS_ERROR_PAGE";