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

Commit 06fab147 authored by android-build-team Robot's avatar android-build-team Robot Committed by Anis Assi
Browse files

Merge cherrypicks of [14947192, 14947076, 14946934, 14946935, 14947213,... 

Merge cherrypicks of [14947192, 14947076, 14946934, 14946935, 14947213, 14947214, 14947216, 14947135, 14947136, 14947452, 14947333] into security-aosp-qt-release

Change-Id: I6c0c036855a57110cb4e249056acb081ee36116c
parents 420c6910 f5576b65

cmds/statsd/src/guardrail/StatsdStats.cpp

+4 −1
Original line number Diff line number Diff line
@@ -449,9 +449,12 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) { 
void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {

    lock_guard<std::mutex> lock(mLock);



    if (atomId <= android::util::kMaxPushedAtomId) {

    if (atomId >= 0 && atomId <= android::util::kMaxPushedAtomId) {

        mPushedAtomStats[atomId]++;

    } else {

        if (atomId < 0) {

            android_errorWriteLog(0x534e4554, "187957589");

        }

        if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {

            mNonPlatformPushedAtomStats[atomId]++;

        }