Lose the boolean from Runtime.nativeExit.

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

Change-Id: Icdb30a02444fd75a709b385cacf2b86b4e18f71d

1 files changed, 3 insertions, 6 deletions

diff --git a/src/native/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc
index b7e81af806..3019e95d9d 100644
--- a/src/native/java_lang_Runtime.cc
+++ b/src/native/java_lang_Runtime.cc
@@ -30,11 +30,8 @@ static void Runtime_gc(JNIEnv*, jclass) {
   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 @@ static JNINativeMethod gMethods[] = {
   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"),
 };