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

Commit 8e0212da authored by Tej Singh's avatar Tej Singh Committed by android-build-merger
Browse files

Merge "Persist metric activation across beta4/5 ota" into qt-dev 

am: 12ae9598

Change-Id: I614602e2a4facb0ccdf40ab8599f875750ce0679
parents 590bf9a4 12ae9598

cmds/statsd/src/metrics/MetricProducer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ void MetricProducer::loadActiveMetricLocked(const ActiveMetric& activeMetric, 
            continue;

        }

        auto& activation = it->second;

        if (activeEventActivation.state() == ActiveEventActivation::ACTIVE) {

        // If the event activation does not have a state, assume it is active.

        if (!activeEventActivation.has_state() ||

                activeEventActivation.state() == ActiveEventActivation::ACTIVE) {

            // We don't want to change the ttl for future activations, so we set the start_ns

            // such that start_ns + ttl_ns == currentTimeNs + remaining_ttl_nanos

            activation->start_ns =