summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Vartanian <flooey@google.com> 2018-09-17 12:36:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-09-17 12:36:50 +0000
commit27eec4b376b098892d8292e97fe03c37de988b4c (patch)
tree1d76ac2eea0216317a05055f691c9d33e95d98ea
parent0b925f85c00a9a3a942269236a16e77040a3eeb3 (diff)
parentc3dc82878ff8e55c9f8d870c01e9cf7b4a9710bb (diff)
Merge "Update greylist for Conscrypt update"
-rw-r--r--config/hiddenapi-light-greylist.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index d520b28d42f7..fcd1e4cf85da 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -2293,13 +2293,6 @@ Lcom/android/org/conscrypt/AbstractConscryptSocket;->setSoWriteTimeout(I)V
Lcom/android/org/conscrypt/AbstractConscryptSocket;->setUseSessionTickets(Z)V
Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->setHostname(Ljava/lang/String;)V
Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->setUseSessionTickets(Z)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostname()Ljava/lang/String;
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostnameOrIP()Ljava/lang/String;
-Lcom/android/org/conscrypt/ConscryptSocketBase;->getSoWriteTimeout()I
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setHandshakeTimeout(I)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setHostname(Ljava/lang/String;)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->setSoWriteTimeout(I)V
-Lcom/android/org/conscrypt/ConscryptSocketBase;->socket:Ljava/net/Socket;
Lcom/android/org/conscrypt/OpenSSLKey;-><init>(J)V
Lcom/android/org/conscrypt/OpenSSLKey;->fromPrivateKey(Ljava/security/PrivateKey;)Lcom/android/org/conscrypt/OpenSSLKey;
Lcom/android/org/conscrypt/OpenSSLKey;->getNativeRef()Lcom/android/org/conscrypt/NativeRef$EVP_PKEY;