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

Commit 00ae2776 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Gerrit Code Review
Browse files

Merge "[frameworks][base][statsd] fix -Wreorder-init-list"

parents b389ffe2 691e1a09

cmds/statsd/src/external/StatsPullerManager.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -119,9 +119,10 @@ std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { 
         {.puller = new StatsCompanionServicePuller(android::util::BLUETOOTH_ACTIVITY_INFO)}},

         {.puller = new StatsCompanionServicePuller(android::util::BLUETOOTH_ACTIVITY_INFO)}},

        // system_elapsed_realtime

        // system_elapsed_realtime

        {android::util::SYSTEM_ELAPSED_REALTIME,

        {android::util::SYSTEM_ELAPSED_REALTIME,

         {.pullTimeoutNs = NS_PER_SEC / 2,

         {.coolDownNs = NS_PER_SEC,

          .coolDownNs = NS_PER_SEC,

          .puller = new StatsCompanionServicePuller(android::util::SYSTEM_ELAPSED_REALTIME),

          .puller = new StatsCompanionServicePuller(android::util::SYSTEM_ELAPSED_REALTIME)}},

          .pullTimeoutNs = NS_PER_SEC / 2,

         }},

        // system_uptime

        // system_uptime

        {android::util::SYSTEM_UPTIME,

        {android::util::SYSTEM_UPTIME,

         {.puller = new StatsCompanionServicePuller(android::util::SYSTEM_UPTIME)}},

         {.puller = new StatsCompanionServicePuller(android::util::SYSTEM_UPTIME)}},