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

Commit 30820014 authored by Woody Lin's avatar Woody Lin Committed by Automerger Merge Worker
Browse files

Merge "InitFatalReboot: Trigger panic explicitly for init_fatal_panic" am: c5f0640e 

Change-Id: I669fd71b1aa8e948fd35872e10ff5ee35b340653
parents 168940f5 c5f0640e

init/reboot.cpp

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ 
#include "sigchld_handler.h"

#include "util.h"



#define PROC_SYSRQ "/proc/sysrq-trigger"



using namespace std::literals;



using android::base::boot_clock;

init/reboot_utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <cutils/android_reboot.h>



#include "capabilities.h"

#include "reboot_utils.h"



namespace android {

namespace init {
@@ -138,6 +139,9 @@ void __attribute__((noreturn)) InitFatalReboot(int signal_number) { 
        LOG(ERROR) << backtrace->FormatFrameData(i);

    }

    if (init_fatal_panic) {

        LOG(ERROR) << __FUNCTION__ << ": Trigger crash";

        android::base::WriteStringToFile("c", PROC_SYSRQ);

        LOG(ERROR) << __FUNCTION__ << ": Sys-Rq failed to crash the system; fallback to exit().";

        _exit(signal_number);

    }

    RebootSystem(ANDROID_RB_RESTART2, init_fatal_reboot_target);

init/reboot_utils.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#include <string>



#define PROC_SYSRQ "/proc/sysrq-trigger"



namespace android {

namespace init {