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

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

Browse Source 
* commit 'dde866131793208bbaabf29c4ed2e2a48d9eed95':
  Sync APIs use seconds instead of ms.
This commit is contained in:
Jeff Sharkey
2013-03-27 14:51:57 -07:00
committed by Android Git Automerger
parent 25440d39ed dde8661317
commit 23ebef61c1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();