Snap for 11610999 from b505b3c3e3d5b197e64a62aa0be55dc1ea2b1dd0 to androidx-activity-release
Change-Id: I692e0170b729b7bb8cbd06e0517e0acaadb0d858
diff --git a/BUILD.gn b/BUILD.gn
index 7d2687a..a7e8d2a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -62,7 +62,7 @@
# against the minSdkVersion of the webkit support library module. As the
# minSdkVersion of the support library increases, so should this value. See
# http://crbug.com/828184 for more details.
- min_sdk_version = 14
+ lint_min_sdk_version = 14
# Explicitly enable lint for this apk.
enable_lint = true
diff --git a/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java
index 9e694a2..8872999 100644
--- a/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java
@@ -15,19 +15,29 @@
import java.io.FileNotFoundException;
-/**
- * Boundary interface for DropDataProvider.
- */
+/** Boundary interface for DropDataProvider. */
public interface DropDataContentProviderBoundaryInterface {
boolean onCreate();
+
String[] getStreamTypes(@NonNull Uri uri, @NonNull String mimeTypeFilter);
+
ParcelFileDescriptor openFile(@NonNull ContentProvider providerWrapper, @NonNull Uri uri)
throws FileNotFoundException;
- Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection,
- @Nullable String[] selectionArgs, @Nullable String sortOrder);
+
+ Cursor query(
+ @NonNull Uri uri,
+ @Nullable String[] projection,
+ @Nullable String selection,
+ @Nullable String[] selectionArgs,
+ @Nullable String sortOrder);
+
String getType(@NonNull Uri uri);
+
Uri cache(byte[] imageBytes, String encodingFormat, String filename);
+
void setClearCachedDataIntervalMs(int milliseconds);
+
void onDragEnd(boolean imageInUse);
+
Bundle call(@NonNull String method, @Nullable String arg, @Nullable Bundle extras);
-}
\ No newline at end of file
+}
diff --git a/src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java b/src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java
index 689982f..7e70f21 100644
--- a/src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java
@@ -6,13 +6,9 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for org.chromium.android_webview.WebMessageListener.
- */
+/** Boundary interface for org.chromium.android_webview.WebMessageListener. */
public interface JsReplyProxyBoundaryInterface extends IsomorphicObjectBoundaryInterface {
- /**
- * Prefer using {@link #postMessageWithPayload}.
- */
+ /** Prefer using {@link #postMessageWithPayload}. */
void postMessage(String message);
void postMessageWithPayload(/* MessagePayload */ InvocationHandler payload);
diff --git a/src/org/chromium/support_lib_boundary/ProcessGlobalConfigConstants.java b/src/org/chromium/support_lib_boundary/ProcessGlobalConfigConstants.java
index 1b8a7d2..1f40347 100644
--- a/src/org/chromium/support_lib_boundary/ProcessGlobalConfigConstants.java
+++ b/src/org/chromium/support_lib_boundary/ProcessGlobalConfigConstants.java
@@ -12,9 +12,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-/**
- * Constants for ProcessGlobalConfig shared between chromium and AndroidX.
- */
+/** Constants for ProcessGlobalConfig shared between chromium and AndroidX. */
public final class ProcessGlobalConfigConstants {
private ProcessGlobalConfigConstants() {}
@@ -42,4 +40,4 @@
* chromium via reflection into AndroidX class.
*/
public static final String CACHE_DIRECTORY_BASE_PATH = "CACHE_DIRECTORY_BASE_PATH";
-}
\ No newline at end of file
+}
diff --git a/src/org/chromium/support_lib_boundary/ProfileBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ProfileBoundaryInterface.java
index b276a31..457a561 100644
--- a/src/org/chromium/support_lib_boundary/ProfileBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ProfileBoundaryInterface.java
@@ -9,13 +9,15 @@
import android.webkit.ServiceWorkerController;
import android.webkit.WebStorage;
-/**
- * Boundary interface for Profile.
- */
+/** Boundary interface for Profile. */
public interface ProfileBoundaryInterface {
String getName();
+
CookieManager getCookieManager();
+
WebStorage getWebStorage();
+
GeolocationPermissions getGeoLocationPermissions();
+
ServiceWorkerController getServiceWorkerController();
}
diff --git a/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
index ff9ed8c..77e1644 100644
--- a/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java
@@ -6,13 +6,17 @@
import java.util.concurrent.Executor;
-/**
- * Boundary interface for ProxyController.
- */
+/** Boundary interface for ProxyController. */
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 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/SafeBrowsingResponseBoundaryInterface.java b/src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java
index 0b88b28..4419770 100644
--- a/src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java
@@ -4,11 +4,11 @@
package org.chromium.support_lib_boundary;
-/**
- * Boundary interface for SafeBrowsingResponseCompat.
- */
+/** Boundary interface for SafeBrowsingResponseCompat. */
public interface SafeBrowsingResponseBoundaryInterface {
void showInterstitial(boolean allowReporting);
+
void proceed(boolean report);
+
void backToSafety(boolean report);
}
diff --git a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java
index 7d2c8f2..c8134bb 100644
--- a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java
@@ -4,9 +4,7 @@
package org.chromium.support_lib_boundary;
-/**
- * Boundary interface for AwContents.addDocumentStartJavascript().
- */
+/** Boundary interface for AwContents.addDocumentStartJavascript(). */
public interface ScriptHandlerBoundaryInterface {
void remove();
}
diff --git a/src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java
index 43d09d7..713ba5c 100644
--- a/src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java
@@ -7,9 +7,7 @@
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
-/**
- * Boundary interface for ServiceWorkerClient.
- */
+/** Boundary interface for ServiceWorkerClient. */
public interface ServiceWorkerClientBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
WebResourceResponse shouldInterceptRequest(WebResourceRequest request);
}
diff --git a/src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java
index 077a8fd..9acb9a8 100644
--- a/src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java
@@ -6,10 +6,9 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for ServiceWorkerController.
- */
+/** Boundary interface for ServiceWorkerController. */
public interface ServiceWorkerControllerBoundaryInterface {
/* ServiceWorkerWebSettings */ InvocationHandler getServiceWorkerWebSettings();
+
void setServiceWorkerClient(/* ServiceWorkerClient */ InvocationHandler client);
}
diff --git a/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
index f13f3a1..b308814 100644
--- a/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
@@ -6,9 +6,7 @@
import java.util.Set;
-/**
- * Boundary interface for ServiceWorkerWebSettings.
- */
+/** Boundary interface for ServiceWorkerWebSettings. */
public interface ServiceWorkerWebSettingsBoundaryInterface {
void setCacheMode(int mode);
diff --git a/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
index 8b281fc..d39558f 100644
--- a/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java
@@ -11,14 +11,17 @@
import java.util.List;
import java.util.Set;
-/**
- * Boundary interface for WebViewFactoryProvider.Statics.
- */
+/** Boundary interface for WebViewFactoryProvider.Statics. */
public interface StaticsBoundaryInterface {
void initSafeBrowsing(Context context, ValueCallback<Boolean> callback);
+
void setSafeBrowsingAllowlist(Set<String> hosts, ValueCallback<Boolean> callback);
+
void setSafeBrowsingWhitelist(List<String> hosts, ValueCallback<Boolean> callback);
+
Uri getSafeBrowsingPrivacyPolicyUrl();
+
boolean isMultiProcessEnabled();
+
String getVariationsHeader();
}
diff --git a/src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java
index 4f21973..c8606db 100644
--- a/src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java
@@ -8,9 +8,7 @@
import java.util.Collection;
import java.util.concurrent.Executor;
-/**
- * Boundary interface for TracingController.
- */
+/** Boundary interface for TracingController. */
public interface TracingControllerBoundaryInterface {
boolean isTracing();
@@ -18,4 +16,4 @@
throws IllegalStateException, IllegalArgumentException;
boolean stop(OutputStream outputStream, Executor executor);
-}
\ No newline at end of file
+}
diff --git a/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java b/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java
index add67f7..f40b601 100644
--- a/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java
@@ -6,4 +6,6 @@
/**
*/
-public interface VisualStateCallbackBoundaryInterface { void onComplete(long requestId); }
+public interface VisualStateCallbackBoundaryInterface {
+ void onComplete(long requestId);
+}
diff --git a/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
index d4315d2..15a2e06 100644
--- a/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java
@@ -6,9 +6,7 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for WebMessage.
- */
+/** Boundary interface for WebMessage. */
public interface WebMessageBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
@Deprecated
String getData();
diff --git a/src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java
index 18710ce..19cbcdd 100644
--- a/src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java
@@ -6,10 +6,9 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for WebMessagePort.WebMessageCallback.
- */
+/** Boundary interface for WebMessagePort.WebMessageCallback. */
public interface WebMessageCallbackBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
- void onMessage(/* WebMessagePort */ InvocationHandler port,
+ void onMessage(
+ /* WebMessagePort */ InvocationHandler port,
/* WebMessage */ InvocationHandler message);
}
diff --git a/src/org/chromium/support_lib_boundary/WebMessageListenerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessageListenerBoundaryInterface.java
index 6019027..4527a09 100644
--- a/src/org/chromium/support_lib_boundary/WebMessageListenerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessageListenerBoundaryInterface.java
@@ -9,10 +9,12 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for org.chromium.android_webview.WebMessageListener.
- */
+/** Boundary interface for org.chromium.android_webview.WebMessageListener. */
public interface WebMessageListenerBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
- void onPostMessage(WebView view, /* WebMessage */ InvocationHandler message, Uri sourceOrigin,
- boolean isMainFrame, /* JsReplyProxy */ InvocationHandler replyProxy);
+ void onPostMessage(
+ WebView view,
+ /* WebMessage */ InvocationHandler message,
+ Uri sourceOrigin,
+ boolean isMainFrame,
+ /* JsReplyProxy */ InvocationHandler replyProxy);
}
diff --git a/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java
index 4635438..1b3061f 100644
--- a/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessagePayloadBoundaryInterface.java
@@ -11,9 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-/**
- * Boundary interface for WebMessagePayload.
- */
+/** Boundary interface for WebMessagePayload. */
public interface WebMessagePayloadBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
@WebMessagePayloadType
int getType();
@@ -25,7 +23,8 @@
byte[] getAsArrayBuffer();
@Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true,
+ @IntDef(
+ flag = true,
value = {WebMessagePayloadType.TYPE_STRING, WebMessagePayloadType.TYPE_ARRAY_BUFFER})
@interface WebMessagePayloadType {
int TYPE_STRING = 0;
diff --git a/src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java
index e78adcf..95ba756 100644
--- a/src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java
@@ -8,9 +8,7 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for WebMessagePort.
- */
+/** Boundary interface for WebMessagePort. */
public interface WebMessagePortBoundaryInterface {
void postMessage(/* WebMessage */ InvocationHandler message);
diff --git a/src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java
index 3830415..93c9399 100644
--- a/src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java
@@ -4,10 +4,9 @@
package org.chromium.support_lib_boundary;
-/**
- * Boundary interface for WebResourceErrorCompat.
- */
+/** Boundary interface for WebResourceErrorCompat. */
public interface WebResourceErrorBoundaryInterface {
int getErrorCode();
+
CharSequence getDescription();
}
diff --git a/src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java
index 30be829..43629ce 100644
--- a/src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java
@@ -4,7 +4,7 @@
package org.chromium.support_lib_boundary;
-/**
- * Boundary interface for WebResourceRequest.
- */
-public interface WebResourceRequestBoundaryInterface { boolean isRedirect(); }
+/** Boundary interface for WebResourceRequest. */
+public interface WebResourceRequestBoundaryInterface {
+ boolean isRedirect();
+}
diff --git a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
index 987dd78..f3a27ce 100644
--- a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
@@ -9,31 +9,37 @@
// 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;
-/**
- * Boundary interface for WebSettingsCompat.
- */
+/** Boundary interface for WebSettingsCompat. */
public interface WebSettingsBoundaryInterface {
void setOffscreenPreRaster(boolean enabled);
+
boolean getOffscreenPreRaster();
void setSafeBrowsingEnabled(boolean enabled);
+
boolean getSafeBrowsingEnabled();
void setDisabledActionModeMenuItems(int menuItems);
+
int getDisabledActionModeMenuItems();
void setWillSuppressErrorPage(boolean suppressed);
+
boolean getWillSuppressErrorPage();
void setForceDark(int forceDarkMode);
+
int getForceDark();
void setAlgorithmicDarkeningAllowed(boolean allow);
+
boolean isAlgorithmicDarkeningAllowed();
@Retention(RetentionPolicy.SOURCE)
@@ -44,26 +50,61 @@
}
void setForceDarkBehavior(@ForceDarkBehavior int forceDarkBehavior);
+
@ForceDarkBehavior
int getForceDarkBehavior();
@Retention(RetentionPolicy.SOURCE)
- @interface WebAuthnSupport {
+ @interface WebauthnSupport {
int NONE = 0;
int APP = 1;
int BROWSER = 2;
}
- void setWebAuthnSupport(@WebAuthnSupport int support);
- @WebAuthnSupport
- int getWebAuthnSupport();
+ void setWebauthnSupport(@WebauthnSupport int support);
+
+ @WebauthnSupport
+ int getWebauthnSupport();
void setRequestedWithHeaderOriginAllowList(Set<String> allowedOriginRules);
+
Set<String> getRequestedWithHeaderOriginAllowList();
void setEnterpriseAuthenticationAppLinkPolicyEnabled(boolean enabled);
+
boolean getEnterpriseAuthenticationAppLinkPolicyEnabled();
void setUserAgentMetadataFromMap(Map<String, Object> uaMetadata);
+
Map<String, Object> getUserAgentMetadataMap();
+
+ @Retention(RetentionPolicy.SOURCE)
+ @interface AttributionBehavior {
+ int DISABLED = 0;
+ int APP_SOURCE_AND_WEB_TRIGGER = 1;
+ int WEB_SOURCE_AND_WEB_TRIGGER = 2;
+ int APP_SOURCE_AND_APP_TRIGGER = 3;
+ }
+
+ void setAttributionBehavior(@AttributionBehavior int behavior);
+
+ @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/WebViewClientBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewClientBoundaryInterface.java
index faaf51f..17cdee1 100644
--- a/src/org/chromium/support_lib_boundary/WebViewClientBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewClientBoundaryInterface.java
@@ -11,18 +11,28 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for WebViewClientCompat.
- */
+/** Boundary interface for WebViewClientCompat. */
public interface WebViewClientBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
void onPageCommitVisible(WebView view, String url);
- void onReceivedError(WebView view, WebResourceRequest request,
+
+ void onReceivedError(
+ WebView view,
+ WebResourceRequest request,
/* WebResourceError */ InvocationHandler error);
+
void onReceivedHttpError(
WebView view, WebResourceRequest request, WebResourceResponse errorResponse);
- void onSafeBrowsingHit(WebView view, WebResourceRequest request, int threatType,
+
+ void onSafeBrowsingHit(
+ WebView view,
+ WebResourceRequest request,
+ int threatType,
/* SafeBrowsingResponse */ InvocationHandler callback);
+
boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request);
- boolean onWebAuthnIntent(WebView view, PendingIntent intent,
+
+ boolean onWebAuthnIntent(
+ WebView view,
+ PendingIntent intent,
/* WebAuthnCallbackBoundaryInterface */ InvocationHandler callback);
}
diff --git a/src/org/chromium/support_lib_boundary/WebViewCookieManagerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewCookieManagerBoundaryInterface.java
index f79cd22..64bd71f 100644
--- a/src/org/chromium/support_lib_boundary/WebViewCookieManagerBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewCookieManagerBoundaryInterface.java
@@ -6,9 +6,7 @@
import java.util.List;
-/**
- * Boundary interface for CookieManagerCompat.
- */
+/** Boundary interface for CookieManagerCompat. */
public interface WebViewCookieManagerBoundaryInterface {
List<String> getCookieInfo(String url);
}
diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
index 629f36f..717b3d3 100644
--- a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
@@ -13,19 +13,39 @@
/**
*/
public interface WebViewProviderBoundaryInterface {
- void insertVisualStateCallback(long requestId,
- /* VisualStateCallback */ InvocationHandler callback);
+ void insertVisualStateCallback(
+ long requestId, /* VisualStateCallback */ InvocationHandler callback);
+
/* WebMessagePort */ InvocationHandler[] createWebMessageChannel();
+
void postMessageToMainFrame(/* WebMessage */ InvocationHandler message, Uri targetOrigin);
- void addWebMessageListener(String jsObjectName, String[] allowedOriginRules,
+
+ void addWebMessageListener(
+ String jsObjectName,
+ String[] allowedOriginRules,
/* WebMessageListener */ InvocationHandler listener);
+
void removeWebMessageListener(String jsObjectName);
+
/* ScriptHandler */ InvocationHandler addDocumentStartJavaScript(
String script, String[] allowedOriginRules);
+
WebViewClient getWebViewClient();
+
WebChromeClient getWebChromeClient();
+
/* WebViewRenderer */ InvocationHandler getWebViewRenderer();
+
/* WebViewRendererClient */ InvocationHandler getWebViewRendererClient();
+
void setWebViewRendererClient(
/* WebViewRendererClient */ InvocationHandler webViewRendererClient);
+
+ void setProfile(String profileName);
+
+ void setAudioMuted(boolean muted);
+
+ boolean isAudioMuted();
+
+ /* Profile */ InvocationHandler getProfile();
}
diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
index 9d02930..521c7bb 100644
--- a/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
@@ -12,12 +12,20 @@
*/
public interface WebViewProviderFactoryBoundaryInterface {
/* SupportLibraryWebViewChromium */ InvocationHandler createWebView(WebView webview);
+
/* SupportLibWebkitToCompatConverter */ InvocationHandler getWebkitToCompatConverter();
+
/* StaticsAdapter */ InvocationHandler getStatics();
+
String[] getSupportedFeatures();
+
/* SupportLibraryServiceWorkerController */ InvocationHandler getServiceWorkerController();
+
/* SupportLibraryTracingController */ InvocationHandler getTracingController();
+
/* SupportLibraryProxyController */ InvocationHandler getProxyController();
+
/* DropDataContentProviderBoundaryInterface*/ InvocationHandler getDropDataProvider();
+
/* ProfileStoreBoundaryInterface */ InvocationHandler getProfileStore();
}
diff --git a/src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java
index db5819b..5f52afd 100644
--- a/src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java
@@ -4,9 +4,7 @@
package org.chromium.support_lib_boundary;
-/**
- * Boundary interface for WebViewRenderer.
- */
+/** Boundary interface for WebViewRenderer. */
public interface WebViewRendererBoundaryInterface extends IsomorphicObjectBoundaryInterface {
boolean terminate();
}
diff --git a/src/org/chromium/support_lib_boundary/WebViewRendererClientBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewRendererClientBoundaryInterface.java
index d7b447d..6e3f4f2 100644
--- a/src/org/chromium/support_lib_boundary/WebViewRendererClientBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewRendererClientBoundaryInterface.java
@@ -8,10 +8,9 @@
import java.lang.reflect.InvocationHandler;
-/**
- * Boundary interface for WebViewRendererClient.
- */
+/** Boundary interface for WebViewRendererClient. */
public interface WebViewRendererClientBoundaryInterface extends FeatureFlagHolderBoundaryInterface {
void onRendererUnresponsive(WebView view, /* WebViewRenderer */ InvocationHandler renderer);
+
void onRendererResponsive(WebView view, /* WebViewRenderer */ InvocationHandler renderer);
}
diff --git a/src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java
index 5d4c8ac..c5ab5fe 100644
--- a/src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java
@@ -21,6 +21,7 @@
// ====================================================
/* SupportLibraryWebSettings */ InvocationHandler convertSettings(WebSettings webSettings);
+
/* SupportLibraryWebResourceRequest */ InvocationHandler convertWebResourceRequest(
WebResourceRequest request);
@@ -43,24 +44,28 @@
// ServiceWorkerWebSettings
/* SupportLibServiceWorkerSettings */ InvocationHandler convertServiceWorkerSettings(
/* ServiceWorkerWebSettings */ Object serviceWorkerWebSettings);
+
/* ServiceWorkerWebSettings */ Object convertServiceWorkerSettings(
/* SupportLibServiceWorkerSettings */ InvocationHandler serviceWorkerSettings);
// WebResourceError
/* SupportLibWebResourceError */ InvocationHandler convertWebResourceError(
/* WebResourceError */ Object webResourceError);
+
/* WebResourceError */ Object convertWebResourceError(
/* SupportLibWebResourceError */ InvocationHandler webResourceError);
// SafeBrowsingResponse
/* SupportLibSafeBrowsingResponse */ InvocationHandler convertSafeBrowsingResponse(
/* SafeBrowsingResponse */ Object safeBrowsingResponse);
+
/* SafeBrowsingResponse */ Object convertSafeBrowsingResponse(
/* SupportLibSafeBrowsingResponse */ InvocationHandler safeBrowsingResponse);
// WebMessagePort
/* SupportLibWebMessagePort */ InvocationHandler convertWebMessagePort(
/* WebMessagePort */ Object webMessagePort);
+
/* WebMessagePort */ Object convertWebMessagePort(
/* SupportLibWebMessagePort */ InvocationHandler webMessagePort);
diff --git a/src/org/chromium/support_lib_boundary/package-info.java b/src/org/chromium/support_lib_boundary/package-info.java
index 1baeb36..47ab7de 100644
--- a/src/org/chromium/support_lib_boundary/package-info.java
+++ b/src/org/chromium/support_lib_boundary/package-info.java
@@ -2,7 +2,5 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-/**
- * @hide
- */
+/** @hide */
package org.chromium.support_lib_boundary;
diff --git a/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
index 1432065..a19dcd0 100644
--- a/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
+++ b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
@@ -16,9 +16,7 @@
import java.util.Arrays;
import java.util.Collection;
-/**
- * A set of utility methods used for calling across the support library boundary.
- */
+/** A set of utility methods used for calling across the support library boundary. */
// Although this is not enforced in chromium, this is a requirement enforced when this file is
// mirrored into AndroidX. See http://b/120770118 for details.
public class BoundaryInterfaceReflectionUtil {
@@ -74,8 +72,10 @@
@NonNull Class<T> clazz, @Nullable InvocationHandler invocationHandler) {
if (invocationHandler == null) return null;
return clazz.cast(
- Proxy.newProxyInstance(BoundaryInterfaceReflectionUtil.class.getClassLoader(),
- new Class[] {clazz}, invocationHandler));
+ Proxy.newProxyInstance(
+ BoundaryInterfaceReflectionUtil.class.getClassLoader(),
+ new Class[] {clazz},
+ invocationHandler));
}
/**
@@ -104,7 +104,7 @@
* <p>A {@code null} array of delegates is represented with a {@code null} array of {@link
* InvocationHandler}s. Any individual {@code null} delegate is represented with a {@code null}
* {@link InvocationHandler}.
-
+ *
* @param delegates an array of objects to which to delegate.
* @return an array of InvocationHandlerWithDelegateGetter instances, each delegating to
* the corresponding member of {@code delegates}.
@@ -168,9 +168,7 @@
}
}
- /**
- * Gets the delegate object (which is never {@code null}).
- */
+ /** Gets the delegate object (which is never {@code null}). */
@NonNull
public Object getDelegate() {
return mDelegate;
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index d4a5250..95b6ff5 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -105,9 +105,7 @@
public static final String SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL =
"SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL";
- /**
- * @deprecated Feature was renamed to WEB_MESSAGE_ARRAY_BUFFER. Do not reuse feature name.
- */
+ /** @deprecated Feature was renamed to WEB_MESSAGE_ARRAY_BUFFER. Do not reuse feature name. */
@Deprecated()
public static final String WEB_MESSAGE_GET_MESSAGE_PAYLOAD = "WEB_MESSAGE_GET_MESSAGE_PAYLOAD";
@@ -208,9 +206,7 @@
// WebSettingsCompat.getRequestedWithHeaderMode
// ServiceWorkerWebSettingsCompat.setRequestedWithHeaderMode
// ServiceWorkerWebSettingsCompat.getRequestedWithHeaderMode
- /**
- * @deprecated Feature was never launched. Do not reuse feature name.
- */
+ /** @deprecated Feature was never launched. Do not reuse feature name. */
@Deprecated()
public static final String REQUESTED_WITH_HEADER_CONTROL = "REQUESTED_WITH_HEADER_CONTROL";
@@ -243,10 +239,12 @@
// 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
@@ -260,4 +258,17 @@
// WebSettingsCompat.setUserAgentMetadataFromMap
// WebSettingsCompat.getUserAgentMetadataMap
public static final String USER_AGENT_METADATA = "USER_AGENT_METADATA";
+
+ // 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";
+
+ // WebViewCompat.setAudioMuted
+ // WebViewCompat.isAudioMuted
+ public static final String MUTE_AUDIO = "MUTE_AUDIO";
}
