Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make isSameTrustConfiguration public API" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-09 23:53:18 +00:00
committed by Android (Google) Code Review
parent 135d82ac45 b8e1c6ec69
commit eed55b3b15
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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);
}

3
core/java/android/net/http/X509TrustManagerExtensions.java
View File

@@ -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) {