commit 83dcb7dc66e18e8adc7cbb6ef4f89b6a88942064
author Mark Salyzyn <salyzyn@google.com> Tue Nov 20 08:37:40 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 20 08:37:40 2018 -0800
tree 1958540a8eb62caf881953097ee2e86332174cbc
parent 407851309c5a4e17fcdd063d6a953ed026c60fbf
parent 99fdf46d89a22c6c9d49f508b0dad3998abb7436

Merge "llkd: do not crash kernel if llkd stops running" am: 630d803dee am: e236940dd2
am: 99fdf46d89

Change-Id: I80851973b67596c4f6101063dd005a0b940fab6a

llkd/libllkd.cpp

diff --git a/llkd/libllkd.cpp b/llkd/libllkd.cpp
index 0827470..427dace 100644
--- a/llkd/libllkd.cpp
+++ b/llkd/libllkd.cpp
@@ -555,7 +555,9 @@
 }
 
 void llkAlarmHandler(int) {
-    llkPanicKernel(false, ::getpid(), "alarm");
+    LOG(FATAL) << "alarm";
+    // NOTREACHED
+    llkPanicKernel(true, ::getpid(), "alarm");
 }
 
 milliseconds GetUintProperty(const std::string& key, milliseconds def) {