commit d2829c9c64b4eb7ead8da4996b1ff8ba95b7089e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 12 18:37:26 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 12 18:37:26 2023 +0000
tree 48a8fe88ba3d60478512a4d739df13d3c2fb68b2
parent 674a19a2d34a83ef88bf542e391aaa0458a90594
parent baae1c5873d2351a5f396788588d0f940d95b582

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

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

diff --git a/services/core/java/com/android/server/am/StackTracesDumpHelper.java b/services/core/java/com/android/server/am/StackTracesDumpHelper.java
index 01fb0d1..af99684 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 @@
             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"