Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661"

This commit is contained in:
Subir Jhanb
2011-09-08 13:24:45 -07:00
committed by Android (Google) Code Review

View File

@@ -192,10 +192,10 @@ public class SyncManager implements OnAccountsUpdateListener {
private static final long SYNC_ALARM_TIMEOUT_MAX = 2 * 60 * 60 * 1000; // two hours
/**
* The amount of time to wait after attempting a bind before canceling a sync and disabling
* the sync adapter
* The amount of time (in milliseconds) to wait after attempting a bind
* before canceling a sync and disabling the sync adapter
*/
public static final long BIND_TIMEOUT_MS = 30 * 1000;
public static final long BIND_TIMEOUT_MS = 5 * 60 * 1000;
public void onAccountsUpdated(Account[] accounts) {
// remember if this was the first time this was called after an update