Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25af0d7437d4712c321f19aad78305e5245b51c4
This commit is contained in:
Josh Gao
2021-02-19 06:29:53 +00:00
committed by Automerger Merge Worker
parent 94d92b4ddd bfe2b8f496
commit be274642b1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/os/NativeTombstoneManager.java
View File

@@ -42,6 +42,7 @@ import android.system.StructStat;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.proto.ProtoInputStream; import android.util.proto.ProtoInputStream;
import android.util.proto.ProtoParseException;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.server.BootReceiver; import com.android.server.BootReceiver;
@@ -434,7 +435,7 @@ public final class NativeTombstoneManager {
break; break;
} }
} }
} catch (IOException ex) { } catch (IOException | ProtoParseException ex) {
Slog.e(TAG, "Failed to parse tombstone", ex); Slog.e(TAG, "Failed to parse tombstone", ex);
return Optional.empty(); return Optional.empty();
} }