ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b5bf09a5: Merge "Allow more time for HttpPost watchdog timeout" into froyo

Browse Source 
Merge commit 'b5bf09a56d30885f985950faa1daa18e8899c32e' into froyo-plus-aosp

* commit 'b5bf09a56d30885f985950faa1daa18e8899c32e':
  Allow more time for HttpPost watchdog timeout
This commit is contained in:
Marc Blank 2010-04-28 09:32:24 -07:00 committed by Android Git Automerger
commit 773dc43cc2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/exchange/EasSyncService.java
View File

@ -128,7 +128,7 @@ public class EasSyncService extends AbstractSyncService {
// Connection timeout is the time given to connect to the server before reporting an IOException // Connection timeout is the time given to connect to the server before reporting an IOException
static private final int CONNECTION_TIMEOUT = 20*SECONDS; static private final int CONNECTION_TIMEOUT = 20*SECONDS;
// The extra time allowed beyond the COMMAND_TIMEOUT before which our watchdog alarm triggers // The extra time allowed beyond the COMMAND_TIMEOUT before which our watchdog alarm triggers
static private final int WATCHDOG_TIMEOUT_ALLOWANCE = 10*SECONDS; static private final int WATCHDOG_TIMEOUT_ALLOWANCE = 30*SECONDS;
static private final String AUTO_DISCOVER_SCHEMA_PREFIX = static private final String AUTO_DISCOVER_SCHEMA_PREFIX =
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/"; "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/";