commit fd10836399c6f2db65ea44ee107e2177770a1a62
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Aug 07 18:30:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 07 18:30:21 2018 +0000
tree 96a08133d5ca7c2b6513d201c6d06a9fb12c185e
parent 1519a2870ba9061a0d05b31fde3eae81f377d02e
parent 34c44387e08e02e6b40bcd34d2192748171c3b47

Merge "Merge "Add getter for X509 certificate" am: 38c9e614af am: 8547723200 am: b84bf6bc3d am: d20922c8fa"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index b18b917..d554d77 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27716,6 +27716,7 @@
     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);
   }

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

diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java
index 4c0f418..21ada36 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.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.util.Date;
 import java.util.Vector;
 
-import com.android.org.bouncycastle.asn1.x509.X509Name;
-
 /**
  * SSL certificate info (certificate details) class
  */
@@ -248,6 +247,14 @@
     }
 
     /**
+     * @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) {