commit 1dae72d7516b60f7fae10a8c452134f78ddd8163
author Tom Cherry <tomcherry@google.com> Thu Apr 20 21:02:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 21:02:42 2017 +0000
tree 1b58024c3bac431f2540be79dcdc609571e776ac
parent 739a483cbe7698adbf618aeacc6c11c0bd3cda14
parent d63b42366338d5c0b1612e515a5f3bf45d59422f

Merge "init: fix errno handling on KillProcessGroup" am: f890ca9a1f am: db9f2cb46d am: c7e559ca40
am: 01d9b0e11c

Change-Id: I0b2f5c4992a736c0416b2ebbe576d57f8dbe58da

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index caf5785..c0745e3 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -217,7 +217,7 @@
         r = killProcessGroup(uid_, pid_, signal);
     }
     if (r == -1) {
-        PLOG(ERROR) << "killProcessGroup(" << uid_ << ", " << pid_ << ", " << signal << ") failed";
+        LOG(ERROR) << "killProcessGroup(" << uid_ << ", " << pid_ << ", " << signal << ") failed";
     }
     if (kill(-pid_, signal) == -1) {
         PLOG(ERROR) << "kill(" << pid_ << ", " << signal << ") failed";