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

Commit d430377b authored by Jing Ji's avatar Jing Ji
Browse files

Check if the ANR dump is still ongoing before reporting it 

Bug: 234003550
Test: Manual
Change-Id: I7a6161afe33ec1b7b2094cccb99686215fb5ecaa
parent e196a94c

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

+9 −3
Original line number Diff line number Diff line
@@ -836,12 +836,18 @@ class AppErrors { 
            report.type = ApplicationErrorReport.TYPE_CRASH;

            report.crashInfo = crashInfo;

        } else if (errState.isNotResponding()) {

            final ActivityManager.ProcessErrorStateInfo anrReport =

                    errState.getNotRespondingReport();

            if (anrReport == null) {

                // The ANR dump is still ongoing, ignore it for now.

                return null;

            }

            report.type = ApplicationErrorReport.TYPE_ANR;

            report.anrInfo = new ApplicationErrorReport.AnrInfo();



            report.anrInfo.activity = errState.getNotRespondingReport().tag;

            report.anrInfo.cause = errState.getNotRespondingReport().shortMsg;

            report.anrInfo.info = errState.getNotRespondingReport().longMsg;

            report.anrInfo.activity = anrReport.tag;

            report.anrInfo.cause = anrReport.shortMsg;

            report.anrInfo.info = anrReport.longMsg;

        }



        return report;