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

Commit 69002ae2 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Fix build. 

Change-Id: Icf14e63d759b021b5f9f79f09efa1d101764b9b7
parent 332eb8f7

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -6929,7 +6929,7 @@ package android.content { 
    method public android.content.SyncRequest.Builder setSyncAdapter(android.accounts.Account, java.lang.String);

    method public android.content.SyncRequest.Builder setSyncAdapter(android.accounts.Account, java.lang.String);

    method public android.content.SyncRequest.Builder setSyncAdapter(android.content.ComponentName);

    method public android.content.SyncRequest.Builder setSyncAdapter(android.content.ComponentName);

    method public android.content.SyncRequest.Builder setTransferSize(long, long);

    method public android.content.SyncRequest.Builder setTransferSize(long, long);

    method public android.content.SyncRequest.Builder syncOnce(long, long);

    method public android.content.SyncRequest.Builder syncOnce();

    method public android.content.SyncRequest.Builder syncPeriodic(long, long);

    method public android.content.SyncRequest.Builder syncPeriodic(long, long);

  }

  }































core/java/android/content/ContentResolver.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1748,7 +1748,7 @@ public abstract class ContentResolver {









            new SyncRequest.Builder()







            new SyncRequest.Builder()











                .setSyncAdapter(account, authority)







                .setSyncAdapter(account, authority)











                .setExtras(extras)







                .setExtras(extras)











                .syncOnce(0, 0)     // Immediate sync.







                .syncOnce()     // Immediate sync.











                .build();







                .build();











        requestSync(request);







        requestSync(request);











    }







    }

































core/java/android/content/SyncRequest.java



+3
−14




























Original line number
Original line
Diff line number
Diff line








@@ -330,26 +330,15 @@ public class SyncRequest implements Parcelable {









         *







         *











         * Example







         * Example











         * <pre>







         * <pre>











         *     Perform an immediate sync.







         *     SyncRequest.Builder builder = (new SyncRequest.Builder()).syncOnce();











         *     SyncRequest.Builder builder = (new SyncRequest.Builder()).syncOnce(0, 0);














         *     That is, a sync 0 seconds from now with 0 seconds of flex.














         *














         *     Perform a sync in exactly 5 minutes.














         *     SyncRequest.Builder builder =














         *       new SyncRequest.Builder().syncOnce(5 * MIN_IN_SECS, 0);














         *














         *     Perform a sync in 5 minutes, with one minute of leeway (between 4 and 5 minutes from














         *     now).














         *     SyncRequest.Builder builder =














         *       new SyncRequest.Builder().syncOnce(5 * MIN_IN_SECS, 1 * MIN_IN_SECS);














         * </pre>







         * </pre>











         */







         */











        public Builder syncOnce(long whenSeconds, long beforeSeconds) {







        public Builder syncOnce() {











            if (mSyncType != SYNC_TYPE_UNKNOWN) {







            if (mSyncType != SYNC_TYPE_UNKNOWN) {











                throw new IllegalArgumentException("Sync type has already been defined.");







                throw new IllegalArgumentException("Sync type has already been defined.");











            }







            }











            mSyncType = SYNC_TYPE_ONCE;







            mSyncType = SYNC_TYPE_ONCE;











            setupInterval(whenSeconds, beforeSeconds);







            setupInterval(0, 0);











            return this;







            return this;











        }







        }





















































services/java/com/android/server/content/SyncStorageEngine.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -2669,7 +2669,7 @@ public class SyncStorageEngine extends Handler {









        } else {







        } else {











            SyncRequest.Builder req =







            SyncRequest.Builder req =











                    new SyncRequest.Builder()







                    new SyncRequest.Builder()











                            .syncOnce(0, 0)







                            .syncOnce()











                            .setExtras(extras);







                            .setExtras(extras);











            if (authorityInfo.target.target_provider) {







            if (authorityInfo.target.target_provider) {











                req.setSyncAdapter(authorityInfo.target.account, authorityInfo.target.provider);







                req.setSyncAdapter(authorityInfo.target.account, authorityInfo.target.provider);