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

Commit 7343bb5f authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Deprecate non-X509Certificate SslCertificate constructors"

parents 44c31090 cc687c52

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -117594,7 +117594,7 @@ 
 type="android.net.http.SslCertificate"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="issuedTo" type="java.lang.String">

core/java/android/net/http/SslCertificate.java

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class SslCertificate { 
     * @param issuedBy The entity that issued this certificate

     * @param validNotBefore The not-before date from the certificate validity period in ISO 8601 format

     * @param validNotAfter The not-after date from the certificate validity period in ISO 8601 format

     * @deprecated Use {@link #SslCertificate(String, String, Date, Date)}

     * @deprecated Use {@link #SslCertificate(X509Certificate)}

     */

    @Deprecated

    public SslCertificate(
@@ -124,7 +124,9 @@ public class SslCertificate { 
     * @param issuedBy The entity that issued this certificate

     * @param validNotBefore The not-before date from the certificate validity period

     * @param validNotAfter The not-after date from the certificate validity period

     * @deprecated Use {@link #SslCertificate(X509Certificate)}

     */

    @Deprecated

    public SslCertificate(

            String issuedTo, String issuedBy, Date validNotBefore, Date validNotAfter) {

        mIssuedTo = new DName(issuedTo);