commit 231611a78e46c2144f9c88577772b9ae265922da
author Jeff Brown <jeffbrown@google.com> Thu Mar 15 17:40:31 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Thu Mar 15 19:41:44 2012 -0700
tree c98f8f0f580b8097e52267d1cc797c81927ab177
parent b74e7190e86d559712747e5cdb31a0d390b7af7d

Always call the native exit hook, even for halt().

Change-Id: I6990d66175c4075ab3357c9be1486c11eceb41e5

vm/native/java_lang_Runtime.cpp

diff --git a/vm/native/java_lang_Runtime.cpp b/vm/native/java_lang_Runtime.cpp
index d23b803..f4afe0e 100644
--- a/vm/native/java_lang_Runtime.cpp
+++ b/vm/native/java_lang_Runtime.cpp
@@ -36,7 +36,7 @@
 }
 
 /*
- * private static void nativeExit(int code, boolean isExit)
+ * private static void nativeExit(int code)
  *
  * Runtime.exit() calls this after doing shutdown processing.  Runtime.halt()
  * uses this as well.
@@ -45,18 +45,16 @@
     JValue* pResult)
 {
     int status = args[0];
-    bool isExit = (args[1] != 0);
-
-    if (isExit && gDvm.exitHook != NULL) {
+    if (gDvm.exitHook != NULL) {
         dvmChangeStatus(NULL, THREAD_NATIVE);
         (*gDvm.exitHook)(status);     // not expected to return
         dvmChangeStatus(NULL, THREAD_RUNNING);
         ALOGW("JNI exit hook returned");
     }
-    ALOGD("Calling exit(%d)", status);
 #if defined(WITH_JIT) && defined(WITH_JIT_TUNING)
     dvmCompilerDumpStats();
 #endif
+    ALOGD("Calling exit(%d)", status);
     exit(status);
 }
 
@@ -137,7 +135,7 @@
         Dalvik_java_lang_Runtime_gc },
     { "maxMemory",          "()J",
         Dalvik_java_lang_Runtime_maxMemory },
-    { "nativeExit",         "(IZ)V",
+    { "nativeExit",         "(I)V",
         Dalvik_java_lang_Runtime_nativeExit },
     { "nativeLoad",         "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;",
         Dalvik_java_lang_Runtime_nativeLoad },