Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd2f25f authored by Yi Jin's avatar Yi Jin
Browse files

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
parent f759af6f

cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;

core/proto/android/os/pagetypeinfo.proto

+3 −1
Original line number Diff line number Diff line
@@ -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;

}