summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyush Sharma <ayushsha@google.com>2022-06-24 13:38:48 +0000
committerAyush Sharma <ayushsha@google.com>2022-06-24 13:38:48 +0000
commitd800b38b90a0899ce3018ae766cbcefb3e2b4eab (patch)
treef197f58cb7471666385b439b1d980c4601f53e02
parent73d6b553a37646c60c41d4d125b5c7058bd58207 (diff)
parentda496afa45c94906b609957c5d035574f0a3dc86 (diff)
downloadwebview_support_interfaces-d800b38b90a0899ce3018ae766cbcefb3e2b4eab.tar.gz
[AndroidX Webkit] roll boundary interfaces to da496af
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/73d6b553a37646c60c41d4d125b5c7058bd58207..da496afa45c94906b609957c5d035574f0a3dc86 Test: N/A Change-Id: Ia48f7bd7d88281c37d0dca57be974cc48a33c662
-rw-r--r--BUILD.gn1
-rw-r--r--src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java3
-rw-r--r--src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java28
-rw-r--r--src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java3
-rw-r--r--src/org/chromium/support_lib_boundary/util/Features.java8
5 files changed, 43 insertions, 0 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 348cbf5..c20f885 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,6 +23,7 @@ android_library("boundary_interface_java") {
"src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/WebMessageListenerBoundaryInterface.java",
+ "src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java",
diff --git a/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
index dff7990..93782d5 100644
--- a/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
@@ -10,7 +10,10 @@ import java.lang.reflect.InvocationHandler;
* Boundary interface for WebMessage.
*/
public interface WebMessageBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
+ @Deprecated
String getData();
+ /* MessagePayload */ InvocationHandler getMessagePayload();
+
/* WebMessagePort */ InvocationHandler[] getPorts();
}
diff --git a/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java
new file mode 100644
index 0000000..1a4d6b5
--- /dev/null
+++ b/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java
@@ -0,0 +1,28 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.support_lib_boundary;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Boundary interface for WebMessagePayload.
+ */
+public interface WebMessagePayloadBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
+ @WebMessagePayloadType
+ int getType();
+
+ @Nullable
+ String getAsString();
+
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(flag = true, value = {WebMessagePayloadType.TYPE_STRING})
+ @interface WebMessagePayloadType {
+ int TYPE_STRING = 0;
+ }
+}
diff --git a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
index dd3f383..ba2fd39 100644
--- a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
@@ -64,4 +64,7 @@ public interface WebSettingsBoundaryInterface {
void setRequestedWithHeaderMode(@RequestedWithHeaderMode int mode);
@RequestedWithHeaderMode
int getRequestedWithHeaderMode();
+
+ void setEnterpriseAuthenticationAppLinkPolicyEnabled(boolean enabled);
+ boolean getEnterpriseAuthenticationAppLinkPolicyEnabled();
}
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index 1415361..4c38495 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -105,6 +105,9 @@ public class Features {
public static final String SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL =
"SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL";
+ // WebMessage.getMessagePayload
+ public static final String WEB_MESSAGE_GET_MESSAGE_PAYLOAD = "WEB_MESSAGE_GET_MESSAGE_PAYLOAD";
+
// WebMessagePortCompat.postMessage
public static final String WEB_MESSAGE_PORT_POST_MESSAGE = "WEB_MESSAGE_PORT_POST_MESSAGE";
@@ -202,4 +205,9 @@ public class Features {
// WebViewCompat.getVariationsHeader
public static final String GET_VARIATIONS_HEADER = "GET_VARIATIONS_HEADER";
+
+ // WebSettingsCompat.setEnterpriseAuthenticationAppLinkPolicyEnabled
+ // WebSettingsCompat.getEnterpriseAuthenticationAppLinkPolicyEnabled
+ public static final String ENTERPRISE_AUTHENTICATION_APP_LINK_POLICY =
+ "ENTERPRISE_AUTHENTICATION_APP_LINK_POLICY";
}