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

Commit 0b0081e2 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 am: be25a824 

am: 72c54c51

Change-Id: I2d037b8c971cfef330e0d02045a50de759692e53
parents 2dba5266 72c54c51

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

+6 −0
Original line number Diff line number Diff line
@@ -217,6 +217,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",
@@ -302,6 +304,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