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

Merge "maybePruneOldTraces: bail if modification times change." am: 9144eaf12f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712554

Change-Id: I9b2e87531f9167aa7b83fd2b30bc75722dee9257
This commit is contained in:
Elliott Hughes
2021-05-21 16:54:17 +00:00
committed by Automerger Merge Worker
parent c59aa931f7 9144eaf12f
commit 72d2a3f7cc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4060,6 +4060,7 @@ public class ActivityManagerService extends IActivityManager.Stub
final int max = SystemProperties.getInt("tombstoned.max_anr_count", 64); final int max = SystemProperties.getInt("tombstoned.max_anr_count", 64);
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
try {
Arrays.sort(files, Comparator.comparingLong(File::lastModified).reversed()); Arrays.sort(files, Comparator.comparingLong(File::lastModified).reversed());
for (int i = 0; i < files.length; ++i) { for (int i = 0; i < files.length; ++i) {
if (i > max || (now - files[i].lastModified()) > DAY_IN_MILLIS) { if (i > max || (now - files[i].lastModified()) > DAY_IN_MILLIS) {
@@ -4068,6 +4069,11 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
} }
} }
} catch (IllegalArgumentException e) {
// The modification times changed while we were sorting. Bail...
// https://issuetracker.google.com/169836837
Slog.w(TAG, "tombstone modification times changed while sorting; not pruning", e);
}
} }
/** /**