From 691e1a093c3c67973183d1b88a4141d663a472f3 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 10 Oct 2019 13:08:34 -0700 Subject: [PATCH] [frameworks][base][statsd] fix -Wreorder-init-list C++20 would like members of designated initializers to be ordered, so that initialization side effects match member initialization in explicit constructors. This differs from C99. Bug: 139945549 Test: mm Change-Id: Iadc96f8f0bf57181970ca3e96b5c5f68ac40a030 Signed-off-by: Nick Desaulniers --- cmds/statsd/src/external/StatsPullerManager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index 475f18a9b0b8d..69e6a11b9ad75 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -119,9 +119,10 @@ std::map 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)}},