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

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

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

Change-Id: I7202abbc1e7f796c7a0c1ab13b2058ca3248125a
This commit is contained in:
Elliott Hughes
2021-09-20 18:11:46 +00:00
committed by Automerger Merge Worker
parent 56cfb31529 94d3762fba
commit a28c22fc1c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/BootReceiver.java
View File

@@ -476,7 +476,11 @@ public class BootReceiver extends BroadcastReceiver {
*/ */
public static void addTombstoneToDropBox(Context ctx, File tombstone, boolean proto) { public static void addTombstoneToDropBox(Context ctx, File tombstone, boolean proto) {
final DropBoxManager db = ctx.getSystemService(DropBoxManager.class); 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(); HashMap<String, Long> timestamps = readTimestamps();
try { try {
if (proto) { if (proto) {
@@ -484,7 +488,7 @@ public class BootReceiver extends BroadcastReceiver {
} else { } else {
final String headers = getBootHeadersToLogAndUpdate(); final String headers = getBootHeadersToLogAndUpdate();
addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE, addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,
TAG_TOMBSTONE); TAG_TOMBSTONE);
} }
} catch (IOException e) { } catch (IOException e) {
Slog.e(TAG, "Can't log tombstone", e); Slog.e(TAG, "Can't log tombstone", e);