Merge changes I73ae8de1,I58260902

am: 6f11744adc

Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8

core/jni/android_util_Binder.cpp

@@ -192,18 +192,12 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
 
     if (env->IsInstanceOf(excep, gErrorOffsets.mClass)) {
         /*
-         * It's an Error: Reraise the exception, detach this thread, and
+         * It's an Error: Reraise the exception and ask the runtime to abort.
-         * wait for the fireworks. Die even more blatantly after a minute
-         * if the gentler attempt doesn't do the trick.
-         *
-         * The GetJavaVM function isn't on the "approved" list of JNI calls
-         * that can be made while an exception is pending, so we want to
-         * get the VM ptr, throw the exception, and then detach the thread.
          */
         env->Throw(excep);
+        ALOGE("java.lang.Error thrown during binder transaction (stack trace follows) : ");
         env->ExceptionDescribe();
-        ALOGE("Forcefully exiting");
+        env->FatalError("java.lang.Error thrown during binder transaction.");
-        exit(1);
     }
 
 bail: