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

Merge commit '773dc43cc2caf7638c610ac85711eed89a06efa5' into kraken

* commit '773dc43cc2caf7638c610ac85711eed89a06efa5':
  Allow more time for HttpPost watchdog timeout
This commit is contained in:
Marc Blank 2010-04-28 09:43:23 -07:00 committed by Android Git Automerger
commit 7aa9e1e0ac

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
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/";