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

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

Merge changes Ibe1feb39,I05be83e4,If1422e4d 

am: a4f086ab

Change-Id: I7e5d431c992f9860ca7b42ca81edfbfd1d8e0a1c
parents 216ac365 a4f086ab

fs_mgr/fs_mgr_verity.cpp

+4 −1
Original line number Diff line number Diff line
@@ -349,9 +349,12 @@ out: 
static int was_verity_restart()

{

    static const char* files[] = {

        // clang-format off

        "/sys/fs/pstore/console-ramoops-0",

        "/sys/fs/pstore/console-ramoops",

        "/proc/last_kmsg",

        NULL

        // clang-format on

    };

    int i;

healthd/healthd_mode_charger.cpp

+14 −8
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <functional>



#include <android-base/file.h>

#include <android-base/macros.h>

#include <android-base/stringprintf.h>



#include <sys/socket.h>
@@ -76,8 +77,6 @@ char *locale; 
#define POWER_ON_KEY_TIME       (2 * MSEC_PER_SEC)

#define UNPLUGGED_SHUTDOWN_TIME (10 * MSEC_PER_SEC)



#define LAST_KMSG_PATH          "/proc/last_kmsg"

#define LAST_KMSG_PSTORE_PATH   "/sys/fs/pstore/console-ramoops"

#define LAST_KMSG_MAX_SZ        (32 * 1024)



#define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -217,15 +216,22 @@ static void dump_last_kmsg(void) 
    LOGW("\n");

    LOGW("*************** LAST KMSG ***************\n");

    LOGW("\n");

    buf = (char *)load_file(LAST_KMSG_PSTORE_PATH, &sz);

    const char* kmsg[] = {

        // clang-format off

        "/sys/fs/pstore/console-ramoops-0",

        "/sys/fs/pstore/console-ramoops",

        "/proc/last_kmsg",

        // clang-format on

    };

    for (size_t i = 0; i < arraysize(kmsg); ++i) {

        buf = (char*)load_file(kmsg[i], &sz);

        if (buf && sz) break;

    }



    if (!buf || !sz) {

        buf = (char *)load_file(LAST_KMSG_PATH, &sz);

    if (!buf || !sz) {

        LOGW("last_kmsg not found. Cold reset?\n");

        goto out;

    }

    }



    len = min(sz, LAST_KMSG_MAX_SZ);

    ptr = buf + (sz - len);

rootdir/init.rc

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ on init 
    mount pstore pstore /sys/fs/pstore

    chown system log /sys/fs/pstore/console-ramoops

    chmod 0440 /sys/fs/pstore/console-ramoops

    chown system log /sys/fs/pstore/console-ramoops-0

    chmod 0440 /sys/fs/pstore/console-ramoops-0

    chown system log /sys/fs/pstore/pmsg-ramoops-0

    chmod 0440 /sys/fs/pstore/pmsg-ramoops-0