diff options
| author | 2023-06-12 18:53:31 +0000 | |
|---|---|---|
| committer | 2023-06-12 18:53:31 +0000 | |
| commit | d64449962cef7a01f017cad6fbf248dd1d1be329 (patch) | |
| tree | 0da6100e8423727a61bc0d9744f903f31f495d9c | |
| parent | 12b2a2c74506625f6d03eac38372e30afcd5c8d0 (diff) | |
| parent | d2829c9c64b4eb7ead8da4996b1ff8ba95b7089e (diff) | |
Merge "Copy predump file's output in case of timeout" into udc-dev am: d2829c9c64
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>
| -rw-r--r-- | services/core/java/com/android/server/am/StackTracesDumpHelper.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/StackTracesDumpHelper.java b/services/core/java/com/android/server/am/StackTracesDumpHelper.java index 01fb0d1d8b18..af99684db6f4 100644 --- a/services/core/java/com/android/server/am/StackTracesDumpHelper.java +++ b/services/core/java/com/android/server/am/StackTracesDumpHelper.java @@ -392,11 +392,9 @@ public class StackTracesDumpHelper { if (TEMP_DUMP_TIME_LIMIT <= timeTaken) { Slog.e(TAG, "Aborted stack trace dump (current primary pid=" + pid + "); deadline exceeded."); - tmpTracesFile.delete(); if (latencyTracker != null) { latencyTracker.dumpStackTracesTempFileTimedOut(); } - return null; } if (DEBUG_ANR) { Slog.d(TAG, "Done with primary pid " + pid + " in " + timeTaken + "ms" |