Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I94eb114d484a02038927f67e08309c60b539100f
This commit is contained in:
TreeHugger Robot
2020-06-13 06:52:53 +00:00
committed by Automerger Merge Worker

View File

@@ -959,7 +959,10 @@ void ValueMetricProducer::flushCurrentBucketLocked(const int64_t& eventTimeNs,
int64_t fullBucketEndTimeNs = getCurrentBucketEndTimeNs();
int64_t bucketEndTime = fullBucketEndTimeNs;
int64_t numBucketsForward = calcBucketsForwardCount(eventTimeNs);
if (numBucketsForward > 1) {
// Skip buckets if this is a pulled metric or a pushed metric that is diffed.
if (numBucketsForward > 1 && (mIsPulled || mUseDiff)) {
VLOG("Skipping forward %lld buckets", (long long)numBucketsForward);
StatsdStats::getInstance().noteSkippedForwardBuckets(mMetricId);
// Something went wrong. Maybe the device was sleeping for a long time. It is better