commit a3375b62d6e203c885df3adc2f0c510eae5488bc
author Josh Gao <jmgao@google.com> Fri Feb 19 06:33:19 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 19 06:33:19 2021 +0000
tree be14b45204f04b88eb8eff0b569b601b22873d71
parent e50f1a06f9341c9589ebd8d93dd2336417b35b81
parent be274642b1eb6c2e04baece66981600fb6dd8b08

Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af3b am: bfe2b8f496 am: be274642b1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ee9fb0eb59d7be9e9e7fe021bb22ef4eb5ef4c0

services/core/java/com/android/server/os/NativeTombstoneManager.java

diff --git a/services/core/java/com/android/server/os/NativeTombstoneManager.java b/services/core/java/com/android/server/os/NativeTombstoneManager.java
index 9984bfa..d95a725 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.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 @@
                             break;
                     }
                 }
-            } catch (IOException ex) {
+            } catch (IOException | ProtoParseException ex) {
                 Slog.e(TAG, "Failed to parse tombstone", ex);
                 return Optional.empty();
             }