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

Commit 83dcb7dc 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 

am: 99fdf46d

Change-Id: I80851973b67596c4f6101063dd005a0b940fab6a
parents 40785130 99fdf46d

llkd/libllkd.cpp

+3 −1
Original line number 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) {

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

    LOG(FATAL) << "alarm";

    // NOTREACHED

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

}



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