From 4ee5ba59ef4d3760c4e89d39ad5e93f6c89ac05d Mon Sep 17 00:00:00 2001 From: Kevin Jeon Date: Mon, 18 Jul 2022 20:26:38 +0000 Subject: [PATCH] Exclude dumpsys from incident in dumpstate This change adds all dumpsys sections defined in incident.proto from being included when incident is called from dumpstate, since these sections are already included elsewhere in bug reports. This reduces the time taken in the INCIDENT REPORT section by ~6.8s (18.64s -> 11.83s). Test: - atest incidentd_test Test: - Took a bug report and verified that the incident report in bug reports no longer contained dumpsys sections. - atest incident_d test Bug: 239444802 Change-Id: Ia090131687401fcbfea9708e80fd02899a8fb643 --- cmds/incidentd/src/IncidentService.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp index 13bf197aa9dc..30a525c52259 100644 --- a/cmds/incidentd/src/IncidentService.cpp +++ b/cmds/incidentd/src/IncidentService.cpp @@ -47,10 +47,16 @@ enum { #define DEFAULT_REFACTORY_PERIOD_MS (24 * 60 * 60 * 1000) // 1 Day // Skip these sections (for dumpstate only) -// Skip logs (1100 - 1108) and traces (1200 - 1202) because they are already in the bug report. +// Skip logs (1100 - 1108), traces (1200 - 1202), dumpsys (3000 - 3024, 3027 - 3056, 4000 - 4001) +// because they are already in the bug report. #define SKIPPED_DUMPSTATE_SECTIONS { \ 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, /* Logs */ \ - 1200, 1201, 1202, /* Native, hal, java traces */ } + 1200, 1201, 1202, /* Native, hal, java traces */ \ + 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, \ + 3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3027, 3028, 3029, \ + 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, \ + 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 4000, \ + 4001, /* Dumpsys */ } namespace android { namespace os {