From 5ed64cd06ce308e91a5ab74e51bcea5fba9a3860 Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@google.com>
Date: Tue, 22 Sep 2009 14:41:46 -0700
Subject: [PATCH] Keep track of 'initial' sync state in SyncStatusInfo

---
 core/java/android/content/SyncStatusInfo.java    | 3 +++
 core/java/android/content/SyncStorageEngine.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/core/java/android/content/SyncStatusInfo.java b/core/java/android/content/SyncStatusInfo.java
index 6687fcb4f8ab8..b8fda030b11c3 100644
--- a/core/java/android/content/SyncStatusInfo.java
+++ b/core/java/android/content/SyncStatusInfo.java
@@ -38,6 +38,7 @@ public class SyncStatusInfo implements Parcelable {
     public String lastFailureMesg;
     public long initialFailureTime;
     public boolean pending;
+    public boolean initialize;
     
     SyncStatusInfo(int authorityId) {
         this.authorityId = authorityId;
@@ -73,6 +74,7 @@ public class SyncStatusInfo implements Parcelable {
         parcel.writeString(lastFailureMesg);
         parcel.writeLong(initialFailureTime);
         parcel.writeInt(pending ? 1 : 0);
+        parcel.writeInt(initialize ? 1 : 0);
     }
 
     SyncStatusInfo(Parcel parcel) {
@@ -94,6 +96,7 @@ public class SyncStatusInfo implements Parcelable {
         lastFailureMesg = parcel.readString();
         initialFailureTime = parcel.readLong();
         pending = parcel.readInt() != 0;
+        initialize = parcel.readInt() != 0;
     }
     
     public static final Creator<SyncStatusInfo> CREATOR = new Creator<SyncStatusInfo>() {
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java
index 6e312d2eb4199..fbdd5aee10e44 100644
--- a/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@ -511,6 +511,9 @@ public class SyncStorageEngine extends Handler {
 
             SyncStatusInfo status = getOrCreateSyncStatusLocked(authority.ident);
             status.pending = true;
+            status.initialize = op.extras != null && 
+                 op.extras.containsKey(ContentResolver.SYNC_EXTRAS_INITIALIZE) &&
+                 op.extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE);
         }
 
         reportChange(ContentResolver.SYNC_OBSERVER_TYPE_PENDING);