incidentd can now handle multiple callers asking it for incident reports
Test: bit incident_test:* GtsIncidentManagerTestCases:*
Bug: 123543706
Change-Id: I9f671dd5d8b2ad139f952a23e575c2be16120459
diff --git a/cmds/statsd/tests/UidMap_test.cpp b/cmds/statsd/tests/UidMap_test.cpp
index c04a40c..d9fa4e9 100644
--- a/cmds/statsd/tests/UidMap_test.cpp
+++ b/cmds/statsd/tests/UidMap_test.cpp
@@ -33,6 +33,7 @@
namespace statsd {
using android::util::ProtoOutputStream;
+using android::util::ProtoReader;
#ifdef __ANDROID__
const string kApp1 = "app1.sharing.1";
@@ -179,12 +180,12 @@
vector<uint8_t> bytes;
bytes.resize(proto->size());
size_t pos = 0;
- auto iter = proto->data();
- while (iter.readBuffer() != NULL) {
- size_t toRead = iter.currentToRead();
- std::memcpy(&((bytes)[pos]), iter.readBuffer(), toRead);
+ sp<ProtoReader> reader = proto->data();
+ while (reader->readBuffer() != NULL) {
+ size_t toRead = reader->currentToRead();
+ std::memcpy(&((bytes)[pos]), reader->readBuffer(), toRead);
pos += toRead;
- iter.rp()->move(toRead);
+ reader->move(toRead);
}
results->ParseFromArray(bytes.data(), bytes.size());
}