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

Commit dde86613 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev

parents 8ff0201a 51366be8
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 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;
@@ -408,10 +407,10 @@ public final class ContentService extends IContentService.Stub {
                "no permission to write the sync settings");
        int userId = UserHandle.getCallingUserId();

        if (pollFrequency <= DateUtils.MINUTE_IN_MILLIS) {
        if (pollFrequency < 60) {
            Slog.w(TAG, "Requested poll frequency of " + pollFrequency
                    + "ms being rounded up to 60 seconds.");
            pollFrequency = DateUtils.MINUTE_IN_MILLIS;
                    + " seconds being rounded up to 60 seconds.");
            pollFrequency = 60;
        }

        long identityToken = clearCallingIdentity();