commit 6a4be3a6226cec645cf905dd352e44f7968a7fa4
author Brian Carlstrom <bdc@google.com> Thu Oct 20 16:34:03 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 20 17:01:32 2011 -0700
tree 15c98c404db44f60850a94d9b3cff29ff16e1cd5
parent fb8a127fd2ca8eb6cbbc9d62b708c1fc2b3003a4

Fix calling conventions for UnresolvedDirectMethodTrampolineFromCode

Change-Id: I1b35c33d89f0526c80bc8d21e064617d0eac6cd1

src/dalvik_system_Zygote.cc

diff --git a/src/dalvik_system_Zygote.cc b/src/dalvik_system_Zygote.cc
index a0fd429..3751e13 100644
--- a/src/dalvik_system_Zygote.cc
+++ b/src/dalvik_system_Zygote.cc
@@ -87,7 +87,8 @@
     // so that it is restarted by init and system server will be restarted
     // from there.
     if (pid == gSystemServerPid) {
-      LOG(FATAL) << "Exit zygote because system server (" << pid << ") has terminated";
+      LOG(ERROR) << "Exit zygote because system server (" << pid << ") has terminated";
+      kill(getpid(), SIGKILL);
     }
   }