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

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

Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." into sc-qpr1-dev am:... 

Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." into sc-qpr1-dev am: 94d3762f am: a28c22fc am: 2cfe3828

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

Change-Id: Ie9085ced51942a59d05f2ef8361ab32710b93c0a
parents 0f756963 2cfe3828

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

+6 −2
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) {