summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorWilliam Luh <williamluh@google.com>2013-11-19 00:14:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-19 00:14:20 +0000
commit1680392e1e4450f3801990ada97714d278ccc897 (patch)
tree4a943fd625f35dbde6a468c889bc645b949b91e9 /api
parent856f474132bc3fa32427ddc1b72462ecbe6763a6 (diff)
parent60b96502b39d221afb43ff7e8a49a19a2fb3c2e0 (diff)
downloadframeworks_base-1680392e1e4450f3801990ada97714d278ccc897.zip
frameworks_base-1680392e1e4450f3801990ada97714d278ccc897.tar.gz
frameworks_base-1680392e1e4450f3801990ada97714d278ccc897.tar.bz2
Merge "Expose new API for querying whether a certificate was user added."
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 2845af1..f8768bc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14663,6 +14663,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 isUserAddedCertificate(java.security.cert.X509Certificate);
}
}