diff options
| author | Peter Collingbourne <pcc@google.com> | 2021-03-19 23:42:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-19 23:42:23 +0000 |
| commit | efad4dcd74976f0b051a4673b3cb9fc5fbb75c5a (patch) | |
| tree | 1f5c8be5b92975258d24949ab059ed350e26cebe | |
| parent | 680aaa919527e84c11694a22fc6bb9b708a24668 (diff) | |
| parent | 314afa119181fd0a8f27f9a1e3c0f07f6d744abd (diff) | |
Merge "Support MTE and GWP-ASan features in proto tombstones."
| -rw-r--r-- | services/core/java/com/android/server/os/NativeTombstoneManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/os/NativeTombstoneManager.java b/services/core/java/com/android/server/os/NativeTombstoneManager.java index 9c4c5101cb6c..cc6a8243799d 100644 --- a/services/core/java/com/android/server/os/NativeTombstoneManager.java +++ b/services/core/java/com/android/server/os/NativeTombstoneManager.java @@ -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()) { |