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

Commit df923b18 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c0 am: 3615fbdf 

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

Change-Id: Ic65d659d0cc2116d9289b2e6581af23917285dc2
parents c153e0ef 3615fbdf

services/core/java/com/android/server/BootReceiver.java

+5 −1
Original line number Diff line number Diff line
@@ -476,7 +476,11 @@ public class BootReceiver extends BroadcastReceiver { 
     */

    public static void addTombstoneToDropBox(Context ctx, File tombstone, boolean proto) {

        final DropBoxManager db = ctx.getSystemService(DropBoxManager.class);

        final String bootReason = SystemProperties.get("ro.boot.bootreason", null);

        if (db == null) {

            Slog.e(TAG, "Can't log tombstone: DropBoxManager not available");

            return;

        }



        HashMap<String, Long> timestamps = readTimestamps();

        try {

            if (proto) {