Revert "Revert "DiskStats Westworld Migration""
This reverts commit 6188aa32946f6372f912ccc9281956ca38a8a264.
Reason for revert: ag/4819964 has now been submitted. undoing the roll back.
Test: revert
Test: manually verified output is the same as diskstats.
Change-Id: I9a3292f66e1e28661e1d29f3befd002073b681c1
diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index 2871882..dbc13dc 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -149,9 +149,6 @@
// system_uptime
{android::util::SYSTEM_UPTIME,
{{}, {}, 1 * NS_PER_SEC, new StatsCompanionServicePuller(android::util::SYSTEM_UPTIME)}},
- // disk_space
- {android::util::DISK_SPACE,
- {{}, {}, 1 * NS_PER_SEC, new StatsCompanionServicePuller(android::util::DISK_SPACE)}},
// remaining_battery_capacity
{android::util::REMAINING_BATTERY_CAPACITY,
{{},
@@ -189,7 +186,31 @@
{{5, 6, 7, 8, 9},
{2, 3, 4},
1 * NS_PER_SEC,
- new StatsCompanionServicePuller(android::util::LOOPER_STATS)}}
+ new StatsCompanionServicePuller(android::util::LOOPER_STATS)}},
+ // Disk Stats
+ {android::util::DISK_STATS,
+ {{},
+ {},
+ 1 * NS_PER_SEC,
+ new StatsCompanionServicePuller(android::util::DISK_STATS)}},
+ // Directory usage
+ {android::util::DIRECTORY_USAGE,
+ {{},
+ {},
+ 1 * NS_PER_SEC,
+ new StatsCompanionServicePuller(android::util::DIRECTORY_USAGE)}},
+ // Size of app's code, data, and cache
+ {android::util::APP_SIZE,
+ {{},
+ {},
+ 1 * NS_PER_SEC,
+ new StatsCompanionServicePuller(android::util::APP_SIZE)}},
+ // Size of specific categories of files. Eg. Music.
+ {android::util::CATEGORY_SIZE,
+ {{},
+ {},
+ 1 * NS_PER_SEC,
+ new StatsCompanionServicePuller(android::util::CATEGORY_SIZE)}},
};
StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {