Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6a7c0eb2243ec2a5896d2967c865486d0f96508b
This commit is contained in:
Peter Collingbourne
2021-03-20 00:25:55 +00:00
committed by Automerger Merge Worker
parent 95445c287c efad4dcd74
commit 1f58a4bf12
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/os/NativeTombstoneManager.java
View File

@@ -411,8 +411,13 @@ public final class NativeTombstoneManager {
processName = stream.readString(Tombstone.PROCESS_NAME); processName = stream.readString(Tombstone.PROCESS_NAME);
break; break;
case (int) Tombstone.CAUSE: case (int) Tombstone.CAUSES:
long token = stream.start(Tombstone.CAUSE); 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: cause:
while (stream.nextField() != ProtoInputStream.NO_MORE_FIELDS) { while (stream.nextField() != ProtoInputStream.NO_MORE_FIELDS) {
switch (stream.getFieldNumber()) { switch (stream.getFieldNumber()) {