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

Commit 94e108cd authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Copy predump file's output in case of timeout" into udc-dev am: d2829c9c am: 3a110ac6 am: c7b74489" into udc-qpr-dev-plus-aosp
parents 02e16591 ac1bfdd2

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"