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

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

Merge "llkd: do not crash kernel if llkd stops running" am: 630d803d 

am: e236940d

Change-Id: I4a4e1e9d6adbde69dd091ff231f7b1b1b7fdbde0
parents 658bbfae e236940d

llkd/libllkd.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -555,7 +555,9 @@ void llkPanicKernel(bool dump, pid_t tid, const char* state, const std::string& 
}

}





void llkAlarmHandler(int) {

void llkAlarmHandler(int) {

    llkPanicKernel(false, ::getpid(), "alarm");

    LOG(FATAL) << "alarm";

    // NOTREACHED

    llkPanicKernel(true, ::getpid(), "alarm");

}

}





milliseconds GetUintProperty(const std::string& key, milliseconds def) {

milliseconds GetUintProperty(const std::string& key, milliseconds def) {