diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/http/SslCertificate.java | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 2ab2dc0911cb..139776b4b93d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27632,6 +27632,7 @@ package android.net.http { method public java.util.Date getValidNotAfterDate(); method public deprecated java.lang.String getValidNotBefore(); method public java.util.Date getValidNotBeforeDate(); + method public java.security.cert.X509Certificate getX509Certificate(); method public static android.net.http.SslCertificate restoreState(android.os.Bundle); method public static android.os.Bundle saveState(android.net.http.SslCertificate); } diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java index 4c0f4181e83f..21ada363b3ea 100644 --- a/core/java/android/net/http/SslCertificate.java +++ b/core/java/android/net/http/SslCertificate.java @@ -16,8 +16,6 @@ package android.net.http; -import com.android.internal.util.HexDump; - import android.content.Context; import android.os.Bundle; import android.text.format.DateFormat; @@ -25,6 +23,9 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import com.android.internal.util.HexDump; +import com.android.org.bouncycastle.asn1.x509.X509Name; + import java.io.ByteArrayInputStream; import java.math.BigInteger; import java.security.MessageDigest; @@ -39,8 +40,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Vector; -import com.android.org.bouncycastle.asn1.x509.X509Name; - /** * SSL certificate info (certificate details) class */ @@ -248,6 +247,14 @@ public class SslCertificate { } /** + * @return The {@code X509Certificate} used to create this {@code SslCertificate} or + * {@code null} if no certificate was provided. + */ + public X509Certificate getX509Certificate() { + return mX509Certificate; + } + + /** * Convenience for UI presentation, not intended as public API. */ private static String getSerialNumber(X509Certificate x509Certificate) { |