Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd

1 files changed, 7 insertions, 2 deletions

diff --git a/core/java/android/content/SyncResult.java b/core/java/android/content/SyncResult.java
index 8b0afbd..4f86af9 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;
@@ -181,7 +181,7 @@ public final class SyncResult implements Parcelable {
      * <li> {@link SyncStats#numIoExceptions} > 0
      * <li> {@link #syncAlreadyInProgress}
      * </ul>
-     * @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