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

Merge "Round up periodic syncs with short frequencies." into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2013-03-22 01:18:38 +00:00
committed by Android (Google) Code Review
parent ef79366980 6009459405
commit 6848963d81
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/content/ContentService.java
View File

@@ -37,7 +37,9 @@ import android.os.Parcel;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.util.Slog;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -406,6 +408,12 @@ public final class ContentService extends IContentService.Stub {
"no permission to write the sync settings"); "no permission to write the sync settings");
int userId = UserHandle.getCallingUserId(); 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(); long identityToken = clearCallingIdentity();
try { try {
getSyncManager().getSyncStorageEngine().addPeriodicSync( getSyncManager().getSyncStorageEngine().addPeriodicSync(