Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4271c7c3: Merge change 26449 into eclair

Browse Source 
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp

* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
  Keep track of 'initial' sync state in SyncStatusInfo
This commit is contained in:
Costin Manolache
2009-09-22 15:50:31 -07:00
committed by Android Git Automerger
parent af2c5915a5 4271c7c36b
commit cd7574014c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/SyncStatusInfo.java
View File

@@ -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>() {

3
core/java/android/content/SyncStorageEngine.java
View File

@@ -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);