diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-09-26 16:05:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 16:05:00 -0700 |
| commit | 13987fb43255ccb3802d415e32b1c5caf14291bb (patch) | |
| tree | 84e46d95605b6cf753a65a0ffbaf2d84ab40d4cf /api | |
| parent | 7b879999fe2bef549ed1c04259fcd7f07e10e83b (diff) | |
| parent | 992f238d13fff7c21b60ef6958784a4ed2156784 (diff) | |
| download | frameworks_base-13987fb43255ccb3802d415e32b1c5caf14291bb.zip frameworks_base-13987fb43255ccb3802d415e32b1c5caf14291bb.tar.gz frameworks_base-13987fb43255ccb3802d415e32b1c5caf14291bb.tar.bz2 | |
Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a123620..173dbe5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12745,14 +12745,12 @@ package android.net { method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache); method public java.lang.String[] getDefaultCipherSuites(); method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); - method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, int, android.net.SSLSessionCache); method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache); method public byte[] getNpnSelectedProtocol(java.net.Socket); method public java.lang.String[] getSupportedCipherSuites(); method public void setHostname(java.net.Socket, java.lang.String); method public void setKeyManagers(javax.net.ssl.KeyManager[]); method public void setNpnProtocols(byte[][]); - method public void setSoWriteTimeout(java.net.Socket, int) throws java.net.SocketException; method public void setTrustManagers(javax.net.ssl.TrustManager[]); method public void setUseSessionTickets(java.net.Socket, boolean); } |