From d6ed3cd9da8be6e15f57f11aa02a299cd251220a Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Fri, 19 Feb 2021 16:25:47 -0800
Subject: [PATCH] NativeTombstoneManager: fix tombstone parsing.

For unclear reasons, this was silently succeeding on AOSP, and throwing
a ProtoParseException on internal.

Bug: http://b/159164105
Test: `adb shell crasher` on sc-vf-dev, sc-dev
Change-Id: I605e9db49e344bd57a4e33d32808ca2b5b6f4231
---
 .../core/java/com/android/server/os/NativeTombstoneManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/os/NativeTombstoneManager.java b/services/core/java/com/android/server/os/NativeTombstoneManager.java
index d95a7254efe14..9c4c5101cb6cb 100644
--- a/services/core/java/com/android/server/os/NativeTombstoneManager.java
+++ b/services/core/java/com/android/server/os/NativeTombstoneManager.java
@@ -425,7 +425,7 @@ public final class NativeTombstoneManager {
                                 }
                             }
                             stream.end(token);
-
+                            break;
 
                         case (int) Tombstone.SELINUX_LABEL:
                             selinuxLabel = stream.readString(Tombstone.SELINUX_LABEL);