Merge "Adding guardrails on writing to disk from statsd"

diff --cc cmds/statsd/Android.mk
Simple merge

diff --cc cmds/statsd/src/StatsLogProcessor.cpp
index 1b8efe0,e0187b7..edc9f2c
--- 1/cmds/statsd/src/StatsLogProcessor.cpp
--- 2/cmds/statsd/src/StatsLogProcessor.cpp
+++ b/cmds/statsd/src/StatsLogProcessor.cpp
@@@ -325,10 -305,10 +325,10 @@@ void StatsLogProcessor::WriteDataToDisk
      for (auto& pair : mMetricsManagers) {
          const ConfigKey& key = pair.first;
          vector<uint8_t> data;
 -        onDumpReport(key, &data);
 +        onDumpReportLocked(key, &data);
          // TODO: Add a guardrail to prevent accumulation of file on disk.
-         string file_name = StringPrintf("%s/%d-%lld-%ld", STATS_DATA_DIR, key.GetUid(),
-                                         (long long)key.GetId(), time(nullptr));
+         string file_name = StringPrintf("%s/%ld_%d_%lld", STATS_DATA_DIR, time(nullptr),
+                                         key.GetUid(), (long long)key.GetId());
          StorageManager::writeFile(file_name.c_str(), &data[0], data.size());
      }
  }

diff --cc cmds/statsd/src/config/ConfigManager.cpp
Simple merge

diff --cc cmds/statsd/src/storage/StorageManager.cpp
Simple merge

diff --cc cmds/statsd/src/storage/StorageManager.h
Simple merge