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

2023-06-12 18:37:26 +00:00
parent 674a19a2d3 baae1c5873
commit d2829c9c64
1 changed files with 0 additions and 2 deletions
--- 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"