commit deba83c094d69af038e3dbe2c067785a30a9134e
author Chenjie Yu <cjyu@google.com> Thu Feb 14 00:14:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 14 00:14:33 2019 +0000
tree 826bc6c6ec44180c5bbb1fc8fd7634b544fdc597
parent afe83a6720023ecf4b4c6b712c5519dd6a382b8f
parent 4841d264054fb1c61320986b56cc10e379237674

Merge "fix multiple activation across boot"

cmds/statsd/src/metrics/MetricProducer.cpp

diff --git a/cmds/statsd/src/metrics/MetricProducer.cpp b/cmds/statsd/src/metrics/MetricProducer.cpp
index 1107568..65136ee 100644
--- a/cmds/statsd/src/metrics/MetricProducer.cpp
+++ b/cmds/statsd/src/metrics/MetricProducer.cpp
@@ -107,7 +107,8 @@
     if (it == mEventActivationMap.end()) {
         return;
     }
-    if (mActivationType == MetricActivation::ACTIVATE_ON_BOOT) {
+    if (mActivationType == MetricActivation::ACTIVATE_ON_BOOT &&
+        it->second.state == ActivationState::kNotActive) {
         it->second.state = ActivationState::kActiveOnBoot;
         return;
     }