am deed4505: Merge "Increase EAS command timeout from 20 to 30 seconds" into gingerbread

Merge commit 'deed4505e9ad11626a8163653def57318b2d7d39' into gingerbread-plus-aosp

* commit 'deed4505e9ad11626a8163653def57318b2d7d39':
  Increase EAS command timeout from 20 to 30 seconds
This commit is contained in:
Marc Blank 2010-09-22 13:42:22 -07:00 committed by Android Git Automerger
commit 9b5c615cee

View File

@ -124,7 +124,7 @@ public class EasSyncService extends AbstractSyncService {
// Command timeout is the the time allowed for reading data from an open connection before an
// IOException is thrown. After a small added allowance, our watchdog alarm goes off (allowing
// us to detect a silently dropped connection). The allowance is defined below.
static private final int COMMAND_TIMEOUT = 20*SECONDS;
static private final int COMMAND_TIMEOUT = 30*SECONDS;
// 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