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

Commit 06b10bfb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I4eb151f4b309cbb229c43ad2edcca089afd1ba7e
parents 8e0675e7 131ed898

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

+7 −3
Original line number Diff line number Diff line
@@ -479,9 +479,13 @@ public class BootReceiver extends BroadcastReceiver { 
        final String bootReason = SystemProperties.get("ro.boot.bootreason", null);

        HashMap<String, Long> timestamps = readTimestamps();

        try {

            if (proto) {

                db.addFile(TAG_TOMBSTONE_PROTO, tombstone, 0);

            } else {

                final String headers = getBootHeadersToLogAndUpdate();

                addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,

                    proto ? TAG_TOMBSTONE_PROTO : TAG_TOMBSTONE);

                        TAG_TOMBSTONE);

            }

        } catch (IOException e) {

            Slog.e(TAG, "Can't log tombstone", e);

        }