diff options
| -rw-r--r-- | api/current.xml | 153 | ||||
| -rw-r--r-- | core/java/android/net/http/SslError.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClient.java | 2 |
3 files changed, 153 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 8b20412de615..41714ef71629 100644 --- a/api/current.xml +++ b/api/current.xml @@ -85562,6 +85562,142 @@ > </method> </class> +<class name="SslError" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="SslError" + type="android.net.http.SslError" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="error" type="int"> +</parameter> +<parameter name="certificate" type="android.net.http.SslCertificate"> +</parameter> +</constructor> +<constructor name="SslError" + type="android.net.http.SslError" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="error" type="int"> +</parameter> +<parameter name="certificate" type="java.security.cert.X509Certificate"> +</parameter> +</constructor> +<method name="addError" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="error" type="int"> +</parameter> +</method> +<method name="getCertificate" + return="android.net.http.SslCertificate" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPrimaryError" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hasError" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="error" type="int"> +</parameter> +</method> +<field name="SSL_EXPIRED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SSL_IDMISMATCH" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SSL_MAX_ERROR" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SSL_NOTYETVALID" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SSL_UNTRUSTED" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> </package> <package name="android.net.wifi" > @@ -180048,6 +180184,23 @@ <parameter name="realm" type="java.lang.String"> </parameter> </method> +<method name="onReceivedSslError" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.webkit.WebView"> +</parameter> +<parameter name="handler" type="android.webkit.SslErrorHandler"> +</parameter> +<parameter name="error" type="android.net.http.SslError"> +</parameter> +</method> <method name="onScaleChanged" return="void" abstract="false" diff --git a/core/java/android/net/http/SslError.java b/core/java/android/net/http/SslError.java index 2788cb1ae244..e1b9debb8f2b 100644 --- a/core/java/android/net/http/SslError.java +++ b/core/java/android/net/http/SslError.java @@ -20,8 +20,6 @@ import java.security.cert.X509Certificate; /** * One or more individual SSL errors and the associated SSL certificate - * - * {@hide} */ public class SslError { diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 30dea7442fa3..032295da5d73 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -173,8 +173,6 @@ public class WebViewClient { * @param handler An SslErrorHandler object that will handle the user's * response. * @param error The SSL error object. - * @hide - hide this because it contains a parameter of type SslError, - * which is located in a hidden package. */ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { |