diff options
| author | 2018-09-17 07:07:28 -0700 | |
|---|---|---|
| committer | 2018-09-17 07:07:28 -0700 | |
| commit | 223c3ef691cf07d5ab1ef4ea03aea37af413ec6f (patch) | |
| tree | 4d4e733551cab9eaea9b5a32c9c7ec2a6e688ca9 | |
| parent | 2f5d2a50a84c7d6b828a0118c80468d5696f46b3 (diff) | |
| parent | b4c55fac9a109874169e4a5fb883f3f884fd2052 (diff) | |
Merge "Update greylist for Conscrypt update" am: 27eec4b376
am: b4c55fac9a
Change-Id: Ic860a27f1b15fb99e11ce4b1ddf683b6103adb74
| -rw-r--r-- | config/hiddenapi-light-greylist.txt | 7 |
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; |