diff options
author | Costin Manolache <costin@google.com> | 2009-09-22 14:41:46 -0700 |
---|---|---|
committer | Costin Manolache <costin@google.com> | 2009-09-22 14:41:46 -0700 |
commit | 5ed64cd06ce308e91a5ab74e51bcea5fba9a3860 (patch) | |
tree | 52f286a71ce3c4e3edfeb22a61578107fd3f0451 | |
parent | 0676690091b348d939db0340c3a0d888683c1abb (diff) | |
download | frameworks_base-5ed64cd06ce308e91a5ab74e51bcea5fba9a3860.zip frameworks_base-5ed64cd06ce308e91a5ab74e51bcea5fba9a3860.tar.gz frameworks_base-5ed64cd06ce308e91a5ab74e51bcea5fba9a3860.tar.bz2 |
Keep track of 'initial' sync state in SyncStatusInfo
-rw-r--r-- | core/java/android/content/SyncStatusInfo.java | 3 | ||||
-rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/SyncStatusInfo.java b/core/java/android/content/SyncStatusInfo.java index 6687fcb..b8fda03 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 6e312d2..fbdd5ae 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); |