3 files changed, 13 insertions, 4 deletions
diff --git a/libs/incident/Android.bp b/libs/incident/Android.bp
index 905e3039ff88..0619a9c100dd 100644
--- a/libs/incident/Android.bp
+++ b/libs/incident/Android.bp
@@ -36,6 +36,7 @@ cc_library_shared {
 
     srcs: [
         ":libincident_aidl",
+        "proto/android/os/header.proto",
         "proto/android/os/metadata.proto",
         "src/IncidentReportArgs.cpp",
     ],
@@ -46,4 +47,4 @@ cc_library_shared {
     },
 
     export_include_dirs: ["include"],
-}
-\ No newline at end of file
+}
diff --git a/libs/incident/include/android/os/IncidentReportArgs.h b/libs/incident/include/android/os/IncidentReportArgs.h
index 5e8eac1833ce..ee1e33c43b89 100644
--- a/libs/incident/include/android/os/IncidentReportArgs.h
+++ b/libs/incident/include/android/os/IncidentReportArgs.h
@@ -24,6 +24,8 @@
 #include <set>
 #include <vector>
 
+#include "frameworks/base/libs/incident/proto/android/os/header.pb.h"
+
 namespace android {
 namespace os {
 
@@ -47,7 +49,7 @@ public:
     void setAll(bool all);
     void setDest(int dest);
     void addSection(int section);
-    void addHeader(const vector<uint8_t>& headerProto);
+    void addHeader(const IncidentHeaderProto& headerProto);
 
     inline bool all() const { return mAll; }
     bool containsSection(int section) const;
diff --git a/libs/incident/src/IncidentReportArgs.cpp b/libs/incident/src/IncidentReportArgs.cpp
index 06b7a5b682b1..26261ef929ae 100644
--- a/libs/incident/src/IncidentReportArgs.cpp
+++ b/libs/incident/src/IncidentReportArgs.cpp
@@ -161,9 +161,15 @@ IncidentReportArgs::addSection(int section)
 }
 
 void
-IncidentReportArgs::addHeader(const vector<uint8_t>& headerProto)
+IncidentReportArgs::addHeader(const IncidentHeaderProto& headerProto)
 {
-    mHeaders.push_back(headerProto);
+    vector<uint8_t> header;
+    auto serialized = headerProto.SerializeAsString();
+    if (serialized.empty()) return;
+    for (auto it = serialized.begin(); it != serialized.end(); it++) {
+        header.push_back((uint8_t)*it);
+    }
+    mHeaders.push_back(header);
 }
 
 bool