diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java index 0f1ed3b0c..db13e7e8f 100644 --- a/emailsync/src/com/android/emailsync/SyncManager.java +++ b/emailsync/src/com/android/emailsync/SyncManager.java @@ -34,7 +34,6 @@ import android.net.NetworkInfo; import android.net.NetworkInfo.State; import android.net.Uri; import android.os.Bundle; -import android.os.Debug; import android.os.Handler; import android.os.PowerManager; import android.os.PowerManager.WakeLock; @@ -758,10 +757,10 @@ public abstract class SyncManager extends Service implements Runnable { } /** - * We double the holdDelay from 15 seconds through 4 mins + * We double the holdDelay from 15 seconds through 8 mins */ void escalate() { - if (holdDelay < HOLD_DELAY_MAXIMUM) { + if (holdDelay <= HOLD_DELAY_MAXIMUM) { holdDelay *= 2; } holdEndTime = System.currentTimeMillis() + holdDelay; @@ -2195,6 +2194,7 @@ public abstract class SyncManager extends Service implements Runnable { if (syncError != null) { syncError.escalate(); log(m.mDisplayName + " held for " + syncError.holdDelay + "ms"); + return; } else { log(m.mDisplayName + " added to syncErrorMap, hold for 15s"); }