commit 15f8da95f16707fc1682872bbff273dea77b3016
author Muhammad Qureshi <muhammadq@google.com> Fri Apr 05 10:10:40 2019 -0700
committer Muhammad Qureshi <muhammadq@google.com> Tue Apr 30 07:35:44 2019 -0700
tree c2dd90e44051c0bab0b0924bbc28fbfd46279a7a
parent 844694bc5dd9ef6a6d52389fa42c3a7bba6470e8

Add ActivationType to EventActivation

This allows setting one metric with both IMMEDIATE and ACTIVATE_ON_BOOT
EventActivations

Also, if an on-boot Activation that is already active gets another
activation signal, ignore it.

Bug: 128880263
Fixes: 128880263
Test: statsd_test
Change-Id: I8d483882836c9abc184230b4a70d4734d49d93c3

cmds/statsd/src/StatsLogProcessor.h

diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h
index 2c8382d..0dc597b 100644
--- a/cmds/statsd/src/StatsLogProcessor.h
+++ b/cmds/statsd/src/StatsLogProcessor.h
@@ -222,6 +222,8 @@
     FRIEND_TEST(StatsLogProcessorTest, TestActiveConfigMetricDiskWriteRead);
     FRIEND_TEST(StatsLogProcessorTest, TestActivationOnBoot);
     FRIEND_TEST(StatsLogProcessorTest, TestActivationOnBootMultipleActivations);
+    FRIEND_TEST(StatsLogProcessorTest,
+            TestActivationOnBootMultipleActivationsDifferentActivationTypes);
 
     FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration1);
     FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration2);