Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb56edac authored by Mohamad Mahmoud's avatar Mohamad Mahmoud Committed by Android (Google) Code Review
Browse files

Merge "Move trace pruning after stack dumping"

parents afac90a1 c0cb4bbd

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -3491,9 +3491,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }















            final File tracesDir = new File(ANR_TRACE_DIR);













            // Each set of ANR traces is written to a separate file and dumpstate will process













            // all such files and add them to a captured bug report if they're recent enough.













            maybePruneOldTraces(tracesDir);





























            // NOTE: We should consider creating the file in native code atomically once we've















            // gotten rid of the old scheme of dumping and lot of the code that deals with paths










@@ -3526,6 +3523,9 @@ public class ActivityManagerService extends IActivityManager.Stub













            if (firstPidEndOffset != null) {















                firstPidEndOffset.set(firstPidEndPos);















            }













            // Each set of ANR traces is written to a separate file and dumpstate will process













            // all such files and add them to a captured bug report if they're recent enough.













            maybePruneOldTraces(tracesDir);





























            return tracesFile;















        } finally {