commit 99fdf46d89a22c6c9d49f508b0dad3998abb7436
author Mark Salyzyn <salyzyn@google.com> Tue Nov 20 08:32:25 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 20 08:32:25 2018 -0800
tree 17ee97b59936aa43d8514916b7bc0c29a0864b0b
parent 658bbfae7f4e3f56bd63c4797fe2b0d131c427d5
parent e236940dd2bf73dc7cddedea2aed1e9f6ed51d6d

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

Change-Id: I4a4e1e9d6adbde69dd091ff231f7b1b1b7fdbde0

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