Merge "Binder: Add more logging on Error" into oc-dev (807c9ae5) · Commits · e / os / android_frameworks_base

core/jni/android_util_Binder.cpp

+26 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <sys/types.h>
		#include <unistd.h>

		#include <android-base/stringprintf.h>
		#include <binder/IInterface.h>
		#include <binder/IServiceManager.h>
		#include <binder/IPCThreadState.h>
		@@ -194,10 +195,34 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
		/*
		* It's an Error: Reraise the exception and ask the runtime to abort.
		*/

		// Try to get the exception string. Sometimes logcat isn't available,
		// so try to add it to the abort message.
		std::string exc_msg = "(Unknown exception message)";
		{
		ScopedLocalRef<jclass> exc_class(env, env->GetObjectClass(excep));
		jmethodID method_id = env->GetMethodID(exc_class.get(),
		"toString",
		"()Ljava/lang/String;");
		ScopedLocalRef<jstring> jstr(
		env,
		reinterpret_cast<jstring>(
		env->CallObjectMethod(excep, method_id)));
		env->ExceptionClear(); // Just for good measure.
		if (jstr.get() != nullptr) {
		ScopedUtfChars jstr_utf(env, jstr.get());
		exc_msg = jstr_utf.c_str();
		}
		}

		env->Throw(excep);
		ALOGE("java.lang.Error thrown during binder transaction (stack trace follows) : ");
		env->ExceptionDescribe();
		env->FatalError("java.lang.Error thrown during binder transaction.");

		std::string error_msg = base::StringPrintf(
		"java.lang.Error thrown during binder transaction: %s",
		exc_msg.c_str());
		env->FatalError(error_msg.c_str());
		}

		bail: