From baae1c5873d2351a5f396788588d0f940d95b582 Mon Sep 17 00:00:00 2001
From: Mohamad Mahmoud <mohamadmahmoud@google.com>
Date: Mon, 12 Jun 2023 16:05:04 +0000
Subject: [PATCH] Copy predump file's output in case of timeout

Don't retry on predump timeout, as retrying fails. Instead, copy
debuggerd_client's original message from the temporary dump file.

Bug: 286861949
Test: manually tested
Change-Id: If8e81a46cd42abe07cc6c392028e5efb0cb902d6
---
 .../core/java/com/android/server/am/StackTracesDumpHelper.java  | 2 --
 1 file changed, 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 01fb0d1d8b185..af99684db6f4e 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"