| commit | 9add122296d3b252bdb1b377326870e4413a68d9 | [log] [tgz] |
|---|---|---|
| author | Alon Albert <aalbert@google.com> | Wed Feb 23 13:55:11 2011 -0800 |
| committer | Alon Albert <aalbert@google.com> | Wed Feb 23 13:55:11 2011 -0800 |
| tree | 3f6233510d86ecd849a1d7d7881b8b4125a61fe0 | |
| parent | 3259d8853760a72b811757e1711119d041962a1c [diff] |
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead. Bug: 3402863 Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
diff --git a/core/java/android/net/http/AndroidHttpClient.java b/core/java/android/net/http/AndroidHttpClient.java index e07ee59..0757293 100644 --- a/core/java/android/net/http/AndroidHttpClient.java +++ b/core/java/android/net/http/AndroidHttpClient.java
@@ -108,8 +108,8 @@ HttpConnectionParams.setStaleCheckingEnabled(params, false); // Default connection and socket timeout of 20 seconds. Tweak to taste. - HttpConnectionParams.setConnectionTimeout(params, 20 * 1000); - HttpConnectionParams.setSoTimeout(params, 20 * 1000); + HttpConnectionParams.setConnectionTimeout(params, 60 * 1000); + HttpConnectionParams.setSoTimeout(params, 60 * 1000); HttpConnectionParams.setSocketBufferSize(params, 8192); // Don't handle redirects -- return them to the caller. Our code