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

Commit 506694e6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 6848963d: Merge "Round up periodic syncs with short frequencies." into jb-mr2-dev 

* commit '6848963d':
  Round up periodic syncs with short frequencies.
parents 6338eb11 6848963d

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

+8 −0
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ import android.os.Parcel; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.text.format.DateUtils;

import android.util.Log;

import android.util.Slog;

import android.util.SparseIntArray;



import java.io.FileDescriptor;
@@ -406,6 +408,12 @@ public final class ContentService extends IContentService.Stub { 
                "no permission to write the sync settings");

        int userId = UserHandle.getCallingUserId();



        if (pollFrequency <= DateUtils.MINUTE_IN_MILLIS) {

            Slog.w(TAG, "Requested poll frequency of " + pollFrequency

                    + "ms being rounded up to 60 seconds.");

            pollFrequency = DateUtils.MINUTE_IN_MILLIS;

        }



        long identityToken = clearCallingIdentity();

        try {

            getSyncManager().getSyncStorageEngine().addPeriodicSync(