Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3375b62 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af am:... 

Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af am: bfe2b8f4 am: be274642

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ee9fb0eb59d7be9e9e7fe021bb22ef4eb5ef4c0
parents e50f1a06 be274642

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

+2 −1
Original line number Diff line number Diff line
@@ -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();

            }