Get incidentd cts working again.
- The buffer size increased, and the CTS test that checked that
was triggering.
- Privacy filtering wasn't working for the stack trace sections
- The incident command was not handling the default arguments correctly
- The throttler was throttling streaming reports, which made the
test flaky.
Bug: 126253679
Test: atest CtsIncidentHostTestCases
Change-Id: I342cd7d0421ea8c22b7796fc99e779f21855af73
diff --git a/cmds/incidentd/src/Reporter.h b/cmds/incidentd/src/Reporter.h
index 5179f48..fb3961a 100644
--- a/cmds/incidentd/src/Reporter.h
+++ b/cmds/incidentd/src/Reporter.h
@@ -16,7 +16,6 @@
#pragma once
#include "FdBuffer.h"
-#include "Throttler.h"
#include "WorkDirectory.h"
#include "frameworks/base/core/proto/android/os/metadata.pb.h"
@@ -155,6 +154,18 @@
void clearPersistedRequests();
/**
+ * Move the streaming requests in this batch to that batch. After this call there
+ * will be no streaming requests in this batch.
+ */
+ void transferStreamingRequests(const sp<ReportBatch>& that);
+
+ /**
+ * Move the persisted requests in this batch to that batch. After this call there
+ * will be no streaming requests in this batch.
+ */
+ void transferPersistedRequests(const sp<ReportBatch>& that);
+
+ /**
* Get the requests that have encountered errors.
*/
void getFailedRequests(vector<sp<ReportRequest>>* requests);