commit f36b7f5f02f047b6ffc97b35e231caff061d8a42
author Joe Onorato <joeo@google.com> Wed Jun 05 15:24:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 05 15:24:38 2019 -0700
tree 7408392f8ff264b9dda583f496cbb3dc6b5ead22
parent f008974526ac68c80809fb04218bce9d8508f620
parent da7f7e0a32d6ae1912d1ce8baf4f1ef52dfe9fa7

Merge "Do not include specific_mention sections in bugreports either." into qt-dev
am: da7f7e0a32

Change-Id: I234db31f8ee41ac5a70b46f80d0940f9d4adcff7

cmds/incidentd/src/IncidentService.cpp

diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp
index a8b99ce..a527263 100644
--- a/cmds/incidentd/src/IncidentService.cpp
+++ b/cmds/incidentd/src/IncidentService.cpp
@@ -564,7 +564,8 @@
     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);
         }
     }