am b5bf09a5: Merge "Allow more time for HttpPost watchdog timeout" into froyo
Merge commit 'b5bf09a56d30885f985950faa1daa18e8899c32e' into froyo-plus-aosp
* commit 'b5bf09a56d30885f985950faa1daa18e8899c32e':
Allow more time for HttpPost watchdog timeout
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index f727081..02b5209 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -128,7 +128,7 @@
// Connection timeout is the time given to connect to the server before reporting an IOException
static private final int CONNECTION_TIMEOUT = 20*SECONDS;
// 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 =
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/";