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

Commit be25a824 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "BootReceiver: check console-ramoops-0" am: a09784ac 

am: e7715b35

Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4
parents 1a35cf38 e7715b35

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

+6 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ public class BootReceiver extends BroadcastReceiver { 
                    "/proc/last_kmsg", -LOG_SIZE, "SYSTEM_LAST_KMSG");

            addFileWithFootersToDropBox(db, timestamps, headers, lastKmsgFooter,

                    "/sys/fs/pstore/console-ramoops", -LOG_SIZE, "SYSTEM_LAST_KMSG");

            addFileWithFootersToDropBox(db, timestamps, headers, lastKmsgFooter,

                    "/sys/fs/pstore/console-ramoops-0", -LOG_SIZE, "SYSTEM_LAST_KMSG");

            addFileToDropBox(db, timestamps, headers, "/cache/recovery/log", -LOG_SIZE,

                    "SYSTEM_RECOVERY_LOG");

            addFileToDropBox(db, timestamps, headers, "/cache/recovery/last_kmsg",
@@ -303,6 +305,10 @@ public class BootReceiver extends BroadcastReceiver { 
        if (fileTime <= 0) {

            file = new File("/sys/fs/pstore/console-ramoops");

            fileTime = file.lastModified();

            if (fileTime <= 0) {

                file = new File("/sys/fs/pstore/console-ramoops-0");

                fileTime = file.lastModified();

            }

        }



        if (fileTime <= 0) return;  // File does not exist