diff options
| author | 2011-02-16 12:56:36 -0800 | |
|---|---|---|
| committer | 2011-02-16 12:56:36 -0800 | |
| commit | 7343bb5f1d6441a882423dd8b17e3029d2178514 (patch) | |
| tree | a8154ccb51eb20978e5951b333dedd9a11dc5dca | |
| parent | 44c3109055e6a440b31f9c53a76dbb7dd78c6625 (diff) | |
| parent | cc687c52a0313b3b42d2960c8ca669cf1d94aae8 (diff) | |
Merge "Deprecate non-X509Certificate SslCertificate constructors"
| -rw-r--r-- | api/current.xml | 2 | ||||
| -rw-r--r-- | core/java/android/net/http/SslCertificate.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 3164a0987a34..1ce49d4d7964 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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"> diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java index bba11b004f3e..5079c23ceb64 100644 --- a/core/java/android/net/http/SslCertificate.java +++ b/core/java/android/net/http/SslCertificate.java @@ -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); |