commit e236940dd2bf73dc7cddedea2aed1e9f6ed51d6d
author Mark Salyzyn <salyzyn@google.com> Tue Nov 20 08:28:16 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 20 08:28:16 2018 -0800
tree 03319e6056c258e29ede64f66014d5be33f4d0bc
parent 37bcb64b7e4a715fc3cff5ce3ef445db054ec8c3
parent 630d803dee8ac55c097772045704f59fb8bf4f7e

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

Change-Id: I4685a98b2bc6054eded907e357549b9cd1618eb5

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) {