Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jing Ji
2022-05-28 03:48:07 +00:00
committed by Android (Google) Code Review
parent b44f1fa8ae d430377b2f
commit f3dabda4b0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -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;