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 am: 06b10bfbdc

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

Change-Id: I7ec575c6eff283bb73de0b9cce310aba7811b73a
This commit is contained in:
TreeHugger Robot
2021-05-20 23:38:03 +00:00
committed by Automerger Merge Worker
parent ea4444f387 06b10bfbdc
commit c418f8e64c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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); final String bootReason = SystemProperties.get("ro.boot.bootreason", null);
HashMap<String, Long> timestamps = readTimestamps(); HashMap<String, Long> timestamps = readTimestamps();
try { try {
if (proto) {
db.addFile(TAG_TOMBSTONE_PROTO, tombstone, 0);
} 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,
proto ? TAG_TOMBSTONE_PROTO : 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);
} }