Merge "Prune files from /data/anr/ by number as well as age."
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 24f646a..4f24d9f 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5681,15 +5681,16 @@
* since it's the system_server that creates trace files for most ANRs.
*/
private static void maybePruneOldTraces(File tracesDir) {
- final long now = System.currentTimeMillis();
- final File[] traceFiles = tracesDir.listFiles();
+ final File[] files = tracesDir.listFiles();
+ if (files == null) return;
- if (traceFiles != null) {
- for (File file : traceFiles) {
- if ((now - file.lastModified()) > DAY_IN_MILLIS) {
- if (!file.delete()) {
- Slog.w(TAG, "Unable to prune stale trace file: " + file);
- }
+ final int max = SystemProperties.getInt("tombstoned.max_anr_count", 64);
+ final long now = System.currentTimeMillis();
+ Arrays.sort(files, Comparator.comparingLong(File::lastModified).reversed());
+ for (int i = 0; i < files.length; ++i) {
+ if (i > max || (now - files[i].lastModified()) > DAY_IN_MILLIS) {
+ if (!files[i].delete()) {
+ Slog.w(TAG, "Unable to prune stale trace file: " + files[i]);
}
}
}
