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

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

Merge "Fixed NPE in ProcessRecord.appNotResponding"

parents cbc3b7a2 97b2b749

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

+3 −2
Original line number Diff line number Diff line
@@ -1353,9 +1353,10 @@ final class ProcessRecord implements WindowProcessListener { 
                isInterestingToUserLocked()

                        ? StatsLog.ANROCCURRED__FOREGROUND_STATE__FOREGROUND

                        : StatsLog.ANROCCURRED__FOREGROUND_STATE__BACKGROUND);

        final ProcessRecord parentPr = parentProcess != null

                ? (ProcessRecord) parentProcess.mOwner : null;

        mService.addErrorToDropBox("anr", this, processName, activityShortComponentName,

                parentShortComponentName, (ProcessRecord) parentProcess.mOwner, annotation,

                cpuInfo, tracesFile, null);

                parentShortComponentName, parentPr, annotation, cpuInfo, tracesFile, null);



        if (mService.mActivityTaskManager.mController != null) {

            try {