Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7b74489 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ica5ad8754a8c368bb1fcf83642f64a4e7793dd21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cd0a451 3a110ac6

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

+0 −2
Original line number Diff line number Diff line
@@ -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"