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

Commit 8bbeb4db authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[frameworks][base][statsd] fix -Wreorder-init-list" am: 00ae2776 am:... 

Merge "[frameworks][base][statsd] fix -Wreorder-init-list" am: 00ae2776 am: 8208b201 am: 45129d07
am: 64257451

Change-Id: Ia55d8b88ec2970478eb60eae92d8d2755124e4f1
parents 963754df 64257451

cmds/statsd/src/external/StatsPullerManager.cpp

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

        // system_elapsed_realtime

        {android::util::SYSTEM_ELAPSED_REALTIME,

         {.pullTimeoutNs = NS_PER_SEC / 2,

          .coolDownNs = NS_PER_SEC,

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

         {.coolDownNs = NS_PER_SEC,

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

          .pullTimeoutNs = NS_PER_SEC / 2,

         }},

        // system_uptime

        {android::util::SYSTEM_UPTIME,

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