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

Commit 1daf6456 authored by Yao Chen's avatar Yao Chen Committed by android-build-merger
Browse files

Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev 

am: 23ceeb3a

Change-Id: I0fd1b8d930fb87e144193b9d3911b3a00c3113af
parents 79625818 23ceeb3a

cmds/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp

+3 −2
Original line number Diff line number Diff line
@@ -205,11 +205,12 @@ bool MaxDurationTracker::flushCurrentBucket( 
    bool hasPendingEvent =

            false;  // has either a kStarted or kPaused event across bucket boundaries

    // meaning we need to carry them over to the new bucket.

    for (auto it = mInfos.begin(); it != mInfos.end(); ++it) {

    for (auto it = mInfos.begin(); it != mInfos.end();) {

        if (it->second.state == DurationState::kStopped) {

            // No need to keep buckets for events that were stopped before.

            mInfos.erase(it);

            it = mInfos.erase(it);

        } else {

            ++it;

            hasPendingEvent = true;

        }

    }

cmds/statsd/src/packages/UidMap.cpp

+2 −1
Original line number Diff line number Diff line
@@ -365,7 +365,8 @@ void UidMap::appendUidMap(const int64_t& timestamp, const ConfigKey& key, 
            count++;

            proto->write(FIELD_TYPE_INT64 | FIELD_ID_SNAPSHOT_TIMESTAMP,

                         (long long)record.timestampNs);

            proto->write(FIELD_TYPE_MESSAGE | FIELD_ID_SNAPSHOT_PACKAGE_INFO, record.bytes.data());

            proto->write(FIELD_TYPE_MESSAGE | FIELD_ID_SNAPSHOT_PACKAGE_INFO, record.bytes.data(),

                         record.bytes.size());

            proto->end(snapshotsToken);

        }

    }