diff options
| -rwxr-xr-x | api/current.txt | 10 | ||||
| -rw-r--r-- | config/hiddenapi-light-greylist.txt | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 6d0c5a69081d..4baa8c3f78a3 100755 --- a/api/current.txt +++ b/api/current.txt @@ -72744,10 +72744,13 @@ package javax.net.ssl { method public abstract void beginHandshake() throws javax.net.ssl.SSLException; method public abstract void closeInbound() throws javax.net.ssl.SSLException; method public abstract void closeOutbound(); + method public java.lang.String getApplicationProtocol(); method public abstract java.lang.Runnable getDelegatedTask(); method public abstract boolean getEnableSessionCreation(); method public abstract java.lang.String[] getEnabledCipherSuites(); method public abstract java.lang.String[] getEnabledProtocols(); + method public java.lang.String getHandshakeApplicationProtocol(); + method public java.util.function.BiFunction<javax.net.ssl.SSLEngine, java.util.List<java.lang.String>, java.lang.String> getHandshakeApplicationProtocolSelector(); method public javax.net.ssl.SSLSession getHandshakeSession(); method public abstract javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus(); method public abstract boolean getNeedClientAuth(); @@ -72764,6 +72767,7 @@ package javax.net.ssl { method public abstract void setEnableSessionCreation(boolean); method public abstract void setEnabledCipherSuites(java.lang.String[]); method public abstract void setEnabledProtocols(java.lang.String[]); + method public void setHandshakeApplicationProtocolSelector(java.util.function.BiFunction<javax.net.ssl.SSLEngine, java.util.List<java.lang.String>, java.lang.String>); method public abstract void setNeedClientAuth(boolean); method public void setSSLParameters(javax.net.ssl.SSLParameters); method public abstract void setUseClientMode(boolean); @@ -72822,6 +72826,7 @@ package javax.net.ssl { ctor public SSLParameters(java.lang.String[]); ctor public SSLParameters(java.lang.String[], java.lang.String[]); method public java.security.AlgorithmConstraints getAlgorithmConstraints(); + method public java.lang.String[] getApplicationProtocols(); method public java.lang.String[] getCipherSuites(); method public java.lang.String getEndpointIdentificationAlgorithm(); method public boolean getNeedClientAuth(); @@ -72831,6 +72836,7 @@ package javax.net.ssl { method public final boolean getUseCipherSuitesOrder(); method public boolean getWantClientAuth(); method public void setAlgorithmConstraints(java.security.AlgorithmConstraints); + method public void setApplicationProtocols(java.lang.String[]); method public void setCipherSuites(java.lang.String[]); method public void setEndpointIdentificationAlgorithm(java.lang.String); method public void setNeedClientAuth(boolean); @@ -72935,9 +72941,12 @@ package javax.net.ssl { ctor protected SSLSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException, java.net.UnknownHostException; ctor protected SSLSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException; method public abstract void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener); + method public java.lang.String getApplicationProtocol(); method public abstract boolean getEnableSessionCreation(); method public abstract java.lang.String[] getEnabledCipherSuites(); method public abstract java.lang.String[] getEnabledProtocols(); + method public java.lang.String getHandshakeApplicationProtocol(); + method public java.util.function.BiFunction<javax.net.ssl.SSLSocket, java.util.List<java.lang.String>, java.lang.String> getHandshakeApplicationProtocolSelector(); method public javax.net.ssl.SSLSession getHandshakeSession(); method public abstract boolean getNeedClientAuth(); method public javax.net.ssl.SSLParameters getSSLParameters(); @@ -72950,6 +72959,7 @@ package javax.net.ssl { method public abstract void setEnableSessionCreation(boolean); method public abstract void setEnabledCipherSuites(java.lang.String[]); method public abstract void setEnabledProtocols(java.lang.String[]); + method public void setHandshakeApplicationProtocolSelector(java.util.function.BiFunction<javax.net.ssl.SSLSocket, java.util.List<java.lang.String>, java.lang.String>); method public abstract void setNeedClientAuth(boolean); method public void setSSLParameters(javax.net.ssl.SSLParameters); method public abstract void setUseClientMode(boolean); diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index bb9a7c541bf5..1e3728c3a02a 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -4381,10 +4381,8 @@ Lcom/android/org/bouncycastle/x509/X509V3CertificateGenerator;->setSignatureAlgo Lcom/android/org/bouncycastle/x509/X509V3CertificateGenerator;->setSubjectDN(Lcom/android/org/bouncycastle/asn1/x509/X509Name;)V Lcom/android/org/bouncycastle/x509/X509V3CertificateGenerator;->setSubjectDN(Ljavax/security/auth/x500/X500Principal;)V Lcom/android/org/conscrypt/AbstractConscryptSocket;->getAlpnSelectedProtocol()[B -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocol()Ljava/lang/String; Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocols()[Ljava/lang/String; Lcom/android/org/conscrypt/AbstractConscryptSocket;->getChannelId()[B -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHandshakeApplicationProtocol()Ljava/lang/String; Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostname()Ljava/lang/String; Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostnameOrIP()Ljava/lang/String; Lcom/android/org/conscrypt/AbstractConscryptSocket;->getNpnSelectedProtocol()[B |