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

Commit 1c0e63f2 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Make isSameTrustConfiguration public API" into pi-dev 

am: eed55b3b

Change-Id: I0cfc2eda840f58194d7054930a3111a15a8b8e4b
parents 097ba79d eed55b3b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27627,6 +27627,7 @@ package android.net.http { 
  public class X509TrustManagerExtensions {

    ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException;

    method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String) throws java.security.cert.CertificateException;

    method public boolean isSameTrustConfiguration(java.lang.String, java.lang.String);

    method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);

  }

























core/java/android/net/http/X509TrustManagerExtensions.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@ import android.security.net.config.UserCertificateSource;





























import com.android.org.conscrypt.TrustManagerImpl;





























import java.lang.reflect.Field;















import java.lang.reflect.InvocationTargetException;















import java.lang.reflect.Method;















import java.security.cert.CertificateException;










@@ -133,8 +132,6 @@ public class X509TrustManagerExtensions {













    /**















     * Returns {@code true} if the TrustManager uses the same trust configuration for the provided















     * hostnames.













     *













     * @hide















     */















    @SystemApi















    public boolean isSameTrustConfiguration(String hostname1, String hostname2) {