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

Commit f4ff2d13 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I94eb114d484a02038927f67e08309c60b539100f
parents 2aab9277 5c4b92a1

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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