Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcea3d2 authored by Grace Kloba's avatar Grace Kloba
Browse files

Expose onReceivedSslError() so that the WebView client 

can accept the error and continue.

Fix http://b/issue?id=2299152
parent 14467eb2

api/current.xml

+153 −0
Original line number Diff line number Diff line
@@ -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"

core/java/android/net/http/SslError.java

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import java.security.cert.X509Certificate; 


/**

 * One or more individual SSL errors and the associated SSL certificate

 * 

 * {@hide}

 */

public class SslError {

core/java/android/webkit/WebViewClient.java

+0 −2
Original line number Diff line number Diff line
@@ -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) {