Merge "NativeTombstoneManager: catch ProtoParseException."

2021-02-19 05:02:16 +00:00
parent 09bbad130d 2b67941ffe
commit ecc474af3b
1 changed files with 2 additions and 1 deletions
--- 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();
            }