Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Binder: Add more logging on Error"

Browse Source
This commit is contained in:
Andreas Gampe
2017-06-13 18:34:45 +00:00
committed by Gerrit Code Review
parent 6f11744adc 58383ba095
commit d9f3a3cf37
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/jni/android_util_Binder.cpp
View File

@@ -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: