summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Fischer <ntfschr@google.com> 2019-01-18 17:22:01 -0800
committer android-build-merger <android-build-merger@google.com> 2019-01-18 17:22:01 -0800
commitf85e6546e6596804f07a18452aa3d10cad5597c7 (patch)
tree1af6cc4fc94d2be1e4f0026c1660fd8779ef1b0c
parentda8ca7f8ac585a4aba13c7208d427b5c030e9970 (diff)
parent9f726cd2800421f82b98429cce5fd4070abb6e08 (diff)
WebView: clean up onReceivedSslError docs
am: 9f726cd280 Change-Id: Id927f42978e86296710995c9d445ac7ce168e265
-rw-r--r--core/java/android/webkit/WebViewClient.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java
index bdd7a0900213..a29d44966540 100644
--- a/core/java/android/webkit/WebViewClient.java
+++ b/core/java/android/webkit/WebViewClient.java
@@ -370,11 +370,16 @@ public class WebViewClient {
/**
* Notify the host application that an SSL error occurred while loading a
- * resource. The host application must call either handler.cancel() or
- * handler.proceed(). Note that the decision may be retained for use in
+ * resource. The host application must call either {@link SslErrorHandler#cancel} or
+ * {@link SslErrorHandler#proceed}. Note that the decision may be retained for use in
* response to future SSL errors. The default behavior is to cancel the
* load.
* <p>
+ * This API is only called for recoverable SSL certificate errors. In the case of
+ * non-recoverable errors (such as when the server fails the client), WebView will call {@link
+ * #onReceivedError(WebView, WebResourceRequest, WebResourceError)} with {@link
+ * #ERROR_FAILED_SSL_HANDSHAKE}.
+ * <p>
* Applications are advised not to prompt the user about SSL errors, as
* the user is unlikely to be able to make an informed security decision
* and WebView does not provide any UI for showing the details of the
@@ -382,10 +387,10 @@ public class WebViewClient {
* <p>
* Application overrides of this method may display custom error pages or
* silently log issues, but it is strongly recommended to always call
- * handler.cancel() and never allow proceeding past errors.
+ * {@link SslErrorHandler#cancel} and never allow proceeding past errors.
*
* @param view The WebView that is initiating the callback.
- * @param handler An SslErrorHandler object that will handle the user's
+ * @param handler An {@link SslErrorHandler} that will handle the user's
* response.
* @param error The SSL error object.
*/