Merge "Support MTE and GWP-ASan features in proto tombstones." am: efad4dcd74 am: 1f58a4bf12 am: f26d63feb3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625208

Change-Id: If1ff31554c8651b964acf28d54c7334d333e6f99
This commit is contained in:
Peter Collingbourne
2021-03-22 10:54:45 +00:00
committed by Automerger Merge Worker

View File

@@ -411,8 +411,13 @@ public final class NativeTombstoneManager {
processName = stream.readString(Tombstone.PROCESS_NAME);
break;
case (int) Tombstone.CAUSE:
long token = stream.start(Tombstone.CAUSE);
case (int) Tombstone.CAUSES:
if (!crashReason.equals("")) {
// Causes appear in decreasing order of likelihood. For now we only
// want the most likely crash reason here, so ignore all others.
break;
}
long token = stream.start(Tombstone.CAUSES);
cause:
while (stream.nextField() != ProtoInputStream.NO_MORE_FIELDS) {
switch (stream.getFieldNumber()) {