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

Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830

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

Change-Id: I5335419fd0000edd36f7e20b522960f7f8bcbd43
This commit is contained in:
TreeHugger Robot
2021-05-20 23:14:51 +00:00
committed by Automerger Merge Worker
parent a1a2de8882 131ed89830
commit 2e29a12ebb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,9 +479,13 @@ public class BootReceiver extends BroadcastReceiver {
final String bootReason = SystemProperties.get("ro.boot.bootreason", null);
HashMap<String, Long> timestamps = readTimestamps();
try {
final String headers = getBootHeadersToLogAndUpdate();
addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,
proto ? TAG_TOMBSTONE_PROTO : TAG_TOMBSTONE);
if (proto) {
db.addFile(TAG_TOMBSTONE_PROTO, tombstone, 0);
} else {
final String headers = getBootHeadersToLogAndUpdate();
addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,
TAG_TOMBSTONE);
}
} catch (IOException e) {
Slog.e(TAG, "Can't log tombstone", e);
}