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

Commit e923779e 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: de19a086 

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



Change-Id: I36573c88149e9ef347ef2da21ac4faa22db920d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5711844d de19a086

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"