Merge "Fix pulling interval may become 0 in cts" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-03-20 23:31:24 +00:00
committed by Android (Google) Code Review

View File

@ -166,6 +166,11 @@ void StatsPullerManagerImpl::RegisterReceiver(int tagId, wp<PullDataReceiver> re
// Round it to the nearest minutes. This is the limit of alarm manager.
// In practice, we should limit it higher.
long roundedIntervalMs = intervalMs/1000/60 * 1000 * 60;
// Scheduled pulling should be at least 1 min apart.
// This can be lower in cts tests, in which case we round it to 1 min.
if (roundedIntervalMs < 60 * 1000) {
roundedIntervalMs = 60 * 1000;
}
// There is only one alarm for all pulled events. So only set it to the smallest denom.
if (roundedIntervalMs < mCurrentPullingInterval) {
VLOG("Updating pulling interval %ld", intervalMs);