commit 28c7bfdb245c09dfb6d953c42c42ebc5bb178ea1
author Elliott Hughes <enh@google.com> Fri Jun 01 12:45:40 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 01 12:45:40 2012 -0700
tree c9fb61afdd73ded021cbc0b0d2b6d1001f8e2706
parent 60234563a621362c6ffe753fe5368afcd6682bcb

Lose the boolean from Runtime.nativeExit.

(This is getting ics-mr1-plus-art back in sync with dalvik-dev.)

Change-Id: Icdb30a02444fd75a709b385cacf2b86b4e18f71d

src/native/java_lang_Runtime.cc

diff --git a/src/native/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc
index b7e81af..3019e95 100644
--- a/src/native/java_lang_Runtime.cc
+++ b/src/native/java_lang_Runtime.cc
@@ -30,11 +30,8 @@
   Runtime::Current()->GetHeap()->CollectGarbage(false);
 }
 
-static void Runtime_nativeExit(JNIEnv*, jclass, jint status, jboolean isExit) {
-  // isExit is true for System.exit and false for System.halt.
-  if (isExit) {
-    Runtime::Current()->CallExitHook(status);
-  }
+static void Runtime_nativeExit(JNIEnv*, jclass, jint status) {
+  Runtime::Current()->CallExitHook(status);
   exit(status);
 }
 
@@ -78,7 +75,7 @@
   NATIVE_METHOD(Runtime, freeMemory, "()J"),
   NATIVE_METHOD(Runtime, gc, "()V"),
   NATIVE_METHOD(Runtime, maxMemory, "()J"),
-  NATIVE_METHOD(Runtime, nativeExit, "(IZ)V"),
+  NATIVE_METHOD(Runtime, nativeExit, "(I)V"),
   NATIVE_METHOD(Runtime, nativeLoad, "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;"),
   NATIVE_METHOD(Runtime, totalMemory, "()J"),
 };