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

Commit c53d238f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add kill reason and subreason to trace slice" into main

parents 3e2e0b3b 0ad0a5f3

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

+4 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,10 @@ class ProcessRecord extends ProcessRecordInternal implements WindowProcessListen 
    void killLocked(String reason, String description, @Reason int reasonCode,

            @SubReason int subReason, boolean noisy, boolean asyncKPG) {

        if (!mKilledByAm) {

            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "kill");

            if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {

                Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                        "kill/" + processName + "/" + reasonCode + "/" + subReason);

            }

            if (reasonCode == ApplicationExitInfo.REASON_ANR

                    && mErrorState.getAnrAnnotation() != null) {

                description = description + ": " + mErrorState.getAnrAnnotation();