commit 8208b201cadbe426f8144fe612ca9883a64b2b2d
author Nick Desaulniers <ndesaulniers@google.com> Fri Oct 11 09:24:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 11 09:24:42 2019 -0700
tree dc032066cb454de78416c96e2a7168b35e37da7a
parent 799a6aa021645a1d6f358b88cce1c5fa6c90d28e
parent 00ae2776303d19d434de0c64be96008be55f0738

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

Change-Id: Icf1d23aba020cec0b084c435cfcf2a2ca4a66f83

cmds/statsd/src/external/StatsPullerManager.cpp

diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index 475f18a..69e6a11 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -119,9 +119,10 @@
          {.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)}},