summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Birk Pakkenberg <pbirk@google.com>2023-11-15 14:31:42 +0000
committerPeter Birk Pakkenberg <pbirk@google.com>2023-11-15 14:31:42 +0000
commit100631c32aecc3b9e3e44b171ceccfe98d567956 (patch)
tree61d6d3d32f7e796aada5b197aae00c85ae47dd4b
parentce6b6c8200858847f3b6ae1afa3ddaacb9907d81 (diff)
parentf047724010e0caccfafebb541e0253d987cb151b (diff)
downloadwebview_support_interfaces-100631c32aecc3b9e3e44b171ceccfe98d567956.tar.gz
This rolls the boundary interfaces for the androidx.webkit module to include the following commit range: sso://android/platform/external/webview_support_interfaces/+log/ce6b6c8200858847f3b6ae1afa3ddaacb9907d81..f047724010e0caccfafebb541e0253d987cb151b Test: N/A Change-Id: I7b24281cb86292448ec2815339a002124c919311
-rw-r--r--src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java19
-rw-r--r--src/org/chromium/support_lib_boundary/util/Features.java15
2 files changed, 30 insertions, 4 deletions
diff --git a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
index f41fcb0..8555ea2 100644
--- a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
@@ -9,8 +9,10 @@ package org.chromium.support_lib_boundary;
// app-facing classes should have a boundary-interface that the WebView glue layer can build
// against.
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import java.util.Map;
import java.util.Set;
@@ -79,4 +81,21 @@ public interface WebSettingsBoundaryInterface {
@AttributionBehavior
int getAttributionBehavior();
+
+ @Target(ElementType.TYPE_USE)
+ @Retention(RetentionPolicy.SOURCE)
+ @interface WebViewMediaIntegrityApiStatus {
+ int DISABLED = 0;
+ int ENABLED_WITHOUT_APP_IDENTITY = 1;
+ int ENABLED = 2;
+ }
+
+ void setWebViewMediaIntegrityApiStatus(
+ @WebViewMediaIntegrityApiStatus int defaultPermission,
+ Map<String, @WebViewMediaIntegrityApiStatus Integer> permissionConfig);
+
+ @WebViewMediaIntegrityApiStatus
+ int getWebViewMediaIntegrityApiDefaultStatus();
+
+ Map<String, @WebViewMediaIntegrityApiStatus Integer> getWebViewMediaIntegrityApiOverrideRules();
}
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index 2a2d523..d2e99f3 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -243,10 +243,12 @@ public class Features {
// DropDataContentProvider.call
public static final String IMAGE_DRAG_DROP = "IMAGE_DRAG_DROP";
- // ProfileStore.getOrCreateProfileAsync
- // ProfileStore.getProfileAsync
- // ProfileStore.getAllProfileNamesAsync
- // ProfileStore.deleteProfileAsync
+ // ProfileStore.getInstance
+ // ProfileStore.getOrCreateProfile
+ // ProfileStore.getProfile
+ // ProfileStore.getAllProfileNames
+ // ProfileStore.deleteProfile
+ // Profile.getName
// Profile.getCookieManager
// Profile.getWebStorage
// Profile.getGeolocationPermissions
@@ -264,4 +266,9 @@ public class Features {
// WebSettingsCompat.setAttributionBehavior
// WebSettingsCompat.getAttributionBehavior
public static final String ATTRIBUTION_BEHAVIOR = "ATTRIBUTION_BEHAVIOR";
+
+ // WebSettingsCompat.setWebViewMediaIntegrityApiStatus
+ // WebSettingsCompat.getWebViewMediaIntegrityApiDefaultStatus
+ // WebSettingsCompat.getWebViewMediaIntegrityApiOverrideRules
+ public static final String WEBVIEW_MEDIA_INTEGRITY_API_STATUS = "WEBVIEW_INTEGRITY_API_STATUS";
}