commit 6a5179b89b3978ea53403a3a28f2b1075acab3e5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 31 15:35:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 15:35:15 2019 +0000
tree 23783002c4fa5bd573cead7575dc980cd7764241
parent 35e1775184ec4eb39b26eb6724e3545b22419a63
parent d940880bf9df8d166d070ebb883d54b2e45a6c91

Merge "init: make fatal reboot target configurable" into qt-dev

libappfuse/FuseBridgeLoop.cc

diff --git a/libappfuse/FuseBridgeLoop.cc b/libappfuse/FuseBridgeLoop.cc
index ac94e69..da40ec3 100644
--- a/libappfuse/FuseBridgeLoop.cc
+++ b/libappfuse/FuseBridgeLoop.cc
@@ -86,6 +86,7 @@
         const bool proxy_read_ready = last_proxy_events_.events & EPOLLIN;
         const bool proxy_write_ready = last_proxy_events_.events & EPOLLOUT;
 
+        last_state_ = state_;
         last_device_events_.events = 0;
         last_proxy_events_.events = 0;
 

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 2de7378..c2ee061 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -1373,8 +1373,8 @@
     set_process_group_and_prio(pid, SP_FOREGROUND, ANDROID_PRIORITY_HIGHEST);
 
     inc_killcnt(procp->oomadj);
-    ALOGI("Kill '%s' (%d), uid %d, oom_adj %d to free %ldkB",
-        taskname, pid, uid, procp->oomadj, tasksize * page_k);
+    ALOGE("Kill '%s' (%d), uid %d, oom_adj %d to free %ldkB", taskname, pid, uid, procp->oomadj,
+          tasksize * page_k);
 
     TRACE_KILL_END();