Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 45129d073e

Change-Id: I7493d9e0badeac81abd86856ce5415d83ca1e8ee
This commit is contained in:
Nick Desaulniers
2019-10-11 09:48:24 -07:00
committed by android-build-merger
parent fa9179a361 45129d073e
commit 6425745177
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/statsd/src/external/StatsPullerManager.cpp vendored
View File

@@ -119,9 +119,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)}},