From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Thu, 25 Jan 2018 06:47:29 +0000 (+0000)
Subject: Merge "Adding guardrails on writing to disk from statsd"
X-Git-Tag: android-x86-9.0-r1~245^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d0c260ff418f0d1c9d1536eb1420373391116f88;p=android-x86%2Fframeworks-base.git

Merge "Adding guardrails on writing to disk from statsd"
---

d0c260ff418f0d1c9d1536eb1420373391116f88
diff --cc cmds/statsd/src/StatsLogProcessor.cpp
index 1b8efe02d0d4,e0187b72456d..edc9f2ce6b3c
--- a/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());
      }
  }