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

Commit 9cfb9ce7 authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Merge "Update greylist for Conscrypt update" am: 27eec4b3 am: b4c55fac 

am: 223c3ef6

Change-Id: Icb3187632d62bf313840c6f497115a6210cde7aa
parents b11b75ac 223c3ef6

config/hiddenapi-light-greylist.txt

+0 −7
Original line number Diff line number Diff line
@@ -2222,13 +2222,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;