summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-09-26 14:33:47 -0700
committerBrian Carlstrom <bdc@google.com>2012-09-26 15:48:21 -0700
commit992f238d13fff7c21b60ef6958784a4ed2156784 (patch)
treeda0adb900f6a84ab8f05651acc16d35d1788c366 /api/current.txt
parent4e1ab15b305aac26ad8819fc3b2951e20985944d (diff)
downloadframeworks_base-992f238d13fff7c21b60ef6958784a4ed2156784.zip
frameworks_base-992f238d13fff7c21b60ef6958784a4ed2156784.tar.gz
frameworks_base-992f238d13fff7c21b60ef6958784a4ed2156784.tar.bz2
Reverting public setSoWriteTimeout
This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86 Bug: 7237764 Bug: 6693087 Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index c732c3e..ac9588d 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);
}