From 05d60beb89700925df2a4965000f8f2c5ade6ff4 Mon Sep 17 00:00:00 2001 From: Trevor Johns Date: Wed, 5 Jun 2013 19:23:50 -0700 Subject: docs: Fix minor typo in android.content.SyncResult Change "storage later" to "storage layer" in docs for SyncResult.databaseError. Change-Id: I5fa07c2e58c65dbe00b1341f0cca99d47d2dd264 --- core/java/android/content/SyncResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/content/SyncResult.java') diff --git a/core/java/android/content/SyncResult.java b/core/java/android/content/SyncResult.java index 8b0afbd..6cb0d02 100644 --- a/core/java/android/content/SyncResult.java +++ b/core/java/android/content/SyncResult.java @@ -56,7 +56,7 @@ public final class SyncResult implements Parcelable { /** * Used to indicate that the SyncAdapter experienced a hard error due to an error it - * received from interacting with the storage later. The SyncManager will record that + * received from interacting with the storage layer. The SyncManager will record that * the sync request failed and it will not reschedule the request. */ public boolean databaseError; -- cgit v1.1 From fa77418134c6f1f80af225a78819f069e9c974fb Mon Sep 17 00:00:00 2001 From: Matthew Williams Date: Tue, 18 Jun 2013 15:44:11 -0700 Subject: AnonymousSyncService & SyncRequest. Changes to the way bundles are parcelled broke SM, this update writes out the bundle as xml. This circumvents the need for parcel, and makes it easier to debug whats happening. Change-Id: I6cd5d3a2eb80bfa5b3ae0c7f2d2ff91a65daaa34 --- core/java/android/content/SyncResult.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core/java/android/content/SyncResult.java') diff --git a/core/java/android/content/SyncResult.java b/core/java/android/content/SyncResult.java index 6cb0d02..4f86af9 100644 --- a/core/java/android/content/SyncResult.java +++ b/core/java/android/content/SyncResult.java @@ -181,7 +181,7 @@ public final class SyncResult implements Parcelable { *
  • {@link SyncStats#numIoExceptions} > 0 *
  • {@link #syncAlreadyInProgress} * - * @return true if a hard error is indicated + * @return true if a soft error is indicated */ public boolean hasSoftError() { return syncAlreadyInProgress || stats.numIoExceptions > 0; @@ -195,6 +195,11 @@ public final class SyncResult implements Parcelable { return hasSoftError() || hasHardError(); } + /** + * Convenience method for determining if the Sync should be rescheduled after failing for some + * reason. + * @return true if the SyncManager should reschedule this sync. + */ public boolean madeSomeProgress() { return ((stats.numDeletes > 0) && !tooManyDeletions) || stats.numInserts > 0 -- cgit v1.1