From 6bd2f25f19c6710e7652155f273cfcf330f6e98c Mon Sep 17 00:00:00 2001
From: Yi Jin <jinyithu@google.com>
Date: Tue, 20 Feb 2018 14:32:54 -0800
Subject: [PATCH] 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
---
 cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp | 3 ++-
 core/proto/android/os/pagetypeinfo.proto                | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp b/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp
index 45a0e7b459d25..ab4382ac13f40 100644
--- a/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp
+++ b/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp
@@ -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;
diff --git a/core/proto/android/os/pagetypeinfo.proto b/core/proto/android/os/pagetypeinfo.proto
index f5d77d637733f..0b8a5da44b095 100644
--- a/core/proto/android/os/pagetypeinfo.proto
+++ b/core/proto/android/os/pagetypeinfo.proto
@@ -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;
 }