Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev

2014-08-26 18:13:12 +00:00
parent e7b1a0b68c 3c8a42ddd9
commit 1877924da0
1 changed files with 1 additions and 3 deletions
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -2757,9 +2757,7 @@ public class SyncManager {
                } else {
                    Log.d(TAG, "failed sync operation " + syncOperation + ", " + syncResult);
                    // the operation failed so increase the backoff time
-                    if (!syncResult.syncAlreadyInProgress) {
-                        increaseBackoffSetting(syncOperation);
-                    }
+                    increaseBackoffSetting(syncOperation);
                    // reschedule the sync if so indicated by the syncResult
                    maybeRescheduleSync(syncResult, syncOperation);
                    historyMessage = ContentResolver.syncErrorToString(