From 2b67941ffe592d9a3f1eb9f87bfce58ebb47d570 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Thu, 18 Feb 2021 14:09:37 -0800 Subject: NativeTombstoneManager: catch ProtoParseException. If we can't parse the proto for some reason, don't nuke system_server. Bug: http://b/159164105 Test: `adb shell crasher` on sc-vf-dev Change-Id: Id8af5f41177d68dacfd9da69eddea4d88d62f420 --- services/core/java/com/android/server/os/NativeTombstoneManager.java | 3 ++- 1 file changed, 2 insertions(+), 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 9984bfae30fd..d95a7254efe1 100644 --- a/services/core/java/com/android/server/os/NativeTombstoneManager.java +++ b/services/core/java/com/android/server/os/NativeTombstoneManager.java @@ -42,6 +42,7 @@ import android.system.StructStat; import android.util.Slog; import android.util.SparseArray; import android.util.proto.ProtoInputStream; +import android.util.proto.ProtoParseException; import com.android.internal.annotations.GuardedBy; import com.android.server.BootReceiver; @@ -434,7 +435,7 @@ public final class NativeTombstoneManager { break; } } - } catch (IOException ex) { + } catch (IOException | ProtoParseException ex) { Slog.e(TAG, "Failed to parse tombstone", ex); return Optional.empty(); } -- cgit v1.2.3-59-g8ed1b