summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-06-11 16:13:06 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-06-11 16:13:06 +0000
commit40783c3736d6535f07e529774ff2c2b130a6a01b (patch)
treee34d26512db977633b3d851ce4d990767203e4bb
parent6f4c6abf5309ffe4a01cb54f560bf238c77ad3c7 (diff)
parent375b0aec21774b219421ef1eb040c43c4c5839ef (diff)
downloadbase-40783c3736d6535f07e529774ff2c2b130a6a01b.tar.gz
Merge cherrypicks of [14947012, 14947430, 14947171, 14947470, 14947471, 14947013, 14947490] into security-aosp-pi-releaseandroid-security-9.0.0_r71
Change-Id: I5bc99d1beca370882bb6489310ee9a857ac0c84e
-rw-r--r--cmds/statsd/src/guardrail/StatsdStats.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp
index 764366fc420a..087009e4b0f7 100644
--- a/cmds/statsd/src/guardrail/StatsdStats.cpp
+++ b/cmds/statsd/src/guardrail/StatsdStats.cpp
@@ -352,6 +352,10 @@ void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {
ALOGW("not interested in atom %d", atomId);
return;
}
+ if (atomId < 0) {
+ android_errorWriteLog(0x534e4554, "187957589");
+ return;
+ }
mPushedAtomStats[atomId]++;
}