Merge "Fix NPE in BootReceiver.addTombstoneToDropBox."

2021-10-14 22:40:00 +00:00
parent 59e9a53f60 4964d99029
commit f2ab01c09e
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/BootReceiver.java
+++ b/services/core/java/com/android/server/BootReceiver.java
@@ -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) {