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

Commit 133ab48a authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4 

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



Change-Id: If4274e70f648c166c97619c28498c3720f5f7374
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56d95955 f3dabda4

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;