Add HighAtomic to pagetypeinfo, and don't fail if a header can't be

found in proto definition.

Bug: 73656242
Test: atest incident_helper
Change-Id: Ib89b1a9189445a0598ec5da0c32046f75de3b0c5
This commit is contained in:
Yi Jin
2018-02-20 14:32:54 -08:00
parent f759af6f3b
commit 6bd2f25f19
2 changed files with 5 additions and 2 deletions

View File

@@ -104,7 +104,8 @@ PageTypeInfoParser::Parse(const int in, const int out) const
for (size_t i=0; i<blockHeader.size(); i++) {
if (!table.insertField(&proto, blockHeader[i], blockCounts[i+1])) {
return BAD_VALUE;
fprintf(stderr, "Header %s has bad data %s\n", blockHeader[i].c_str(),
blockCounts[i+1].c_str());
}
}
} else return BAD_VALUE;

View File

@@ -58,7 +58,7 @@ message PageTypeInfoProto {
}
repeated MigrateType migrate_types = 3;
// Next tag: 9
// Next tag: 10
message Block {
option (android.msg_privacy).dest = DEST_AUTOMATIC;
@@ -77,6 +77,8 @@ message PageTypeInfoProto {
optional int32 reserve = 7;
optional int32 isolate = 8;
optional int32 highatomic = 9;
}
repeated Block blocks = 4;
}