Merge "Add stub isSameTrustConfiguration API" (9f591aeb) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -20523,6 +20523,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);
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.net.http;

		import android.annotation.SystemApi;

		import com.android.org.conscrypt.TrustManagerImpl;

		import java.security.cert.CertificateException;
		@@ -80,4 +82,15 @@ public class X509TrustManagerExtensions {
		public boolean isUserAddedCertificate(X509Certificate cert) {
		return mDelegate.isUserAddedCertificate(cert);
		}

		/**
		* Returns {@code true} if the TrustManager uses the same trust configuration for the provided
		* hostnames.
		*
		* @hide
		*/
		@SystemApi
		public boolean isSameTrustConfiguration(String hostname1, String hostname2) {
		return true;
		}
		}