Mark unreleased APIs as deprecated as a warning
These two methods were never released, and will in fact be removed in
the following release.
Adding @Deprecated annotations to them to warn anyone calling them that
they should avoid these APIs.
Test: N/A
Change-Id: Ic8492da83f6ae4dcb7369ce7b7172175409c5f67
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
index dcdf0c2..b283da8 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
@@ -121,6 +121,7 @@
* be reflected in that test as necessary. See http://go/modifying-webview-cts.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testSuppressedErrorPage() throws Throwable {
WebkitUtils.checkFeature(WebViewFeature.SUPPRESS_ERROR_PAGE);
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
index b8ae25db..0ed9655 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
@@ -106,6 +106,7 @@
}
@Test
+ @SuppressWarnings("deprecation") // To be removed in 1.9.0
public void testAddDocumentStartJavaScriptBasicUsage() throws Exception {
mWebViewOnUiThread.addWebMessageListener(JS_OBJECT_NAME, MATCH_EXAMPLE_COM, mListener);
mWebViewOnUiThread.addDocumentStartJavaScript(BASIC_SCRIPT, MATCH_EXAMPLE_COM);
@@ -118,6 +119,7 @@
}
@Test
+ @SuppressWarnings("deprecation") // To be removed in 1.9.0
public void testAddDocumentStartJavaScriptRemoveScript() throws Exception {
mWebViewOnUiThread.addWebMessageListener(JS_OBJECT_NAME, MATCH_EXAMPLE_COM, mListener);
ScriptHandler scriptHandler =
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
index f28c63c..69f6cd5 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
@@ -272,6 +272,8 @@
}
@NonNull
+ @Deprecated
+ @SuppressWarnings("deprecation") // To be removed in 1.9.0
public ScriptHandler addDocumentStartJavaScript(
@NonNull String script, @NonNull Set<String> allowedOriginRules) {
return WebkitUtils.onMainThreadSync(() -> WebViewCompat.addDocumentStartJavaScript(
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
index 595d73c..5c25673f 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
@@ -231,9 +231,9 @@
* returns true for {@link WebViewFeature#SUPPRESS_ERROR_PAGE}.
*
* @param suppressed whether the WebView should suppress its internal error page
- *
- * TODO(cricke): unhide
+ * @deprecated unreleased API will be removed in 1.9.0
*/
+ @Deprecated
@RestrictTo(RestrictTo.Scope.LIBRARY)
@RequiresFeature(name = WebViewFeature.SUPPRESS_ERROR_PAGE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
@@ -258,9 +258,9 @@
*
* @return true if the WebView will suppress its internal error page
* @see #setWillSuppressErrorPage
- *
- * TODO(cricke): unhide
+ * @deprecated unreleased API will be removed in 1.9.0
*/
+ @Deprecated
@RestrictTo(RestrictTo.Scope.LIBRARY)
@RequiresFeature(name = WebViewFeature.SUPPRESS_ERROR_PAGE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index d110b42..d3bf981 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -796,13 +796,13 @@
* @throws IllegalArgumentException If one of the {@code allowedOriginRules} is invalid.
* @see #addWebMessageListener(WebView, String, Set, WebMessageListener)
* @see ScriptHandler
- *
- * TODO(swestphal): unhide when ready.
+ * @deprecated unreleased API will be removed in 1.9.0
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@RequiresFeature(
name = WebViewFeature.DOCUMENT_START_SCRIPT,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
+ @Deprecated
public static @NonNull ScriptHandler addDocumentStartJavaScript(
@NonNull WebView webview,
@NonNull String script,
