Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev

am: cfff472c8e

Change-Id: I98dcfaf8b40f2715c881023d41234508e37db238

cmds/incident_helper/src/main.cpp

@@ -72,6 +72,8 @@ static TextParserBase* selectParser(int section) {
             return new PsParser();
         case 2006:
             return new BatteryTypeParser();
+        case 3026: // system_trace is already a serialized protobuf
+            return new NoopParser();
         default:
             // Return no op parser when no specific ones are implemented.
             return new NoopParser();

cmds/incidentd/src/Section.cpp

@@ -67,6 +67,8 @@ bool section_requires_specific_mention(int sectionId) {
     switch (sectionId) {
         case 3025: // restricted_images
             return true;
+        case 3026: // system_trace
+            return true;
         default:
             return false;
     }

core/proto/android/os/incident.proto

@@ -321,6 +321,14 @@ message IncidentProto {
         (section).args = "incidentcompanion --restricted_image"
     ];
 
+    // System trace as a serialized protobuf.
+    optional bytes system_trace = 3026 [
+        (section).type = SECTION_FILE,
+        (section).args = "/data/misc/perfetto-traces/incident-trace",
+        (privacy).dest = DEST_AUTOMATIC,
+        (section).userdebug_and_eng_only = true
+    ];
+
     // Reserved for OEMs.
     extensions 50000 to 100000;
 }

tools/incident_section_gen/main.cpp

@@ -408,9 +408,10 @@ static bool generateSectionListCpp(Descriptor const* descriptor) {
     for (int i=0; i<descriptor->field_count(); i++) {
         const FieldDescriptor* field = descriptor->field(i);
 
-        if (field->type() != FieldDescriptor::TYPE_MESSAGE
+        if (field->type() != FieldDescriptor::TYPE_MESSAGE &&
-                && field->type() != FieldDescriptor::TYPE_STRING) {
+            field->type() != FieldDescriptor::TYPE_STRING &&
-            continue;
+            field->type() != FieldDescriptor::TYPE_BYTES) {
+          continue;
         }
 
         const SectionFlags s = getSectionFlags(field);