Merge "Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32 am: 758800ef58" into qt-r1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2019-06-05 22:33:28 +00:00
committed by Android (Google) Code Review

View File

@@ -564,7 +564,8 @@ status_t IncidentService::dump(int fd, const Vector<String16>& args) {
int skipped[] = SKIPPED_SECTIONS;
for (const Section** section = SECTION_LIST; *section; section++) {
const int id = (*section)->id;
if (std::find(std::begin(skipped), std::end(skipped), id) == std::end(skipped)) {
if (std::find(std::begin(skipped), std::end(skipped), id) == std::end(skipped)
&& !section_requires_specific_mention(id)) {
incidentArgs.addSection(id);
}
}