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

Merge "Copy predump file's output in case of timeout" into udc-dev am: d2829c9c64

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

Change-Id: Icc095f8594014fe2bec8737dfc9d5dc8f4ac73e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-12 18:53:31 +00:00
committed by Automerger Merge Worker
parent 12b2a2c745 d2829c9c64
commit d64449962c
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/StackTracesDumpHelper.java
View File

@@ -392,11 +392,9 @@ public class StackTracesDumpHelper {
if (TEMP_DUMP_TIME_LIMIT <= timeTaken) { if (TEMP_DUMP_TIME_LIMIT <= timeTaken) {
Slog.e(TAG, "Aborted stack trace dump (current primary pid=" + pid Slog.e(TAG, "Aborted stack trace dump (current primary pid=" + pid
+ "); deadline exceeded."); + "); deadline exceeded.");
tmpTracesFile.delete();
if (latencyTracker != null) { if (latencyTracker != null) {
latencyTracker.dumpStackTracesTempFileTimedOut(); latencyTracker.dumpStackTracesTempFileTimedOut();
} }
return null;
} }
if (DEBUG_ANR) { if (DEBUG_ANR) {
Slog.d(TAG, "Done with primary pid " + pid + " in " + timeTaken + "ms" Slog.d(TAG, "Done with primary pid " + pid + " in " + timeTaken + "ms"