Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4271c7c3 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26449 into eclair 

* changes:
  Keep track of 'initial' sync state in SyncStatusInfo
parents 63147705 5ed64cd0

core/java/android/content/SyncStatusInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -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>() {

core/java/android/content/SyncStorageEngine.java

+3 −0
Original line number Diff line number Diff line
@@ -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);