am 0ce8431c: Merge change Iaa7edda4 into eclair

Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2

* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
  don't reschedule syncs that failed with a tooManyRetries error

core/java/android/content/SyncManager.java

@@ -957,12 +957,16 @@ class SyncManager implements OnAccountsUpdateListener {
                     + previousSyncOperation);
         }
 
+        // If this sync aborted because the internal sync loop retried too many times then
+        //   don't reschedule. Otherwise we risk getting into a retry loop.
         // If the operation succeeded to some extent then retry immediately.
         // If this was a two-way sync then retry soft errors with an exponential backoff.
         // If this was an upward sync then schedule a two-way sync immediately.
         // Otherwise do not reschedule.
-
-        if (syncResult.madeSomeProgress()) {
+        if (syncResult.tooManyRetries) {
+            Log.d(TAG, "not retrying sync operation because it retried too many times: "
+                    + previousSyncOperation);
+        } else if (syncResult.madeSomeProgress()) {
             if (isLoggable) {
                 Log.d(TAG, "retrying sync operation immediately because "
                         + "even though it had an error it achieved some success");