Merge "binder - include calling PID/UID in uncaught remote exception code"
This commit is contained in:
@@ -413,9 +413,13 @@ protected:
|
|||||||
|
|
||||||
if (env->ExceptionCheck()) {
|
if (env->ExceptionCheck()) {
|
||||||
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
||||||
binder_report_exception(env, excep.get(),
|
|
||||||
"*** Uncaught remote exception! "
|
auto state = IPCThreadState::self();
|
||||||
"(Exceptions are not yet supported across processes.)");
|
String8 msg;
|
||||||
|
msg.appendFormat("*** Uncaught remote exception! Exceptions are not yet supported "
|
||||||
|
"across processes. Client PID %d UID %d.",
|
||||||
|
state->getCallingPid(), state->getCallingUid());
|
||||||
|
binder_report_exception(env, excep.get(), msg.c_str());
|
||||||
res = JNI_FALSE;
|
res = JNI_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -431,6 +435,7 @@ protected:
|
|||||||
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
||||||
binder_report_exception(env, excep.get(),
|
binder_report_exception(env, excep.get(),
|
||||||
"*** Uncaught exception in onBinderStrictModePolicyChange");
|
"*** Uncaught exception in onBinderStrictModePolicyChange");
|
||||||
|
// TODO: should turn this to fatal?
|
||||||
}
|
}
|
||||||
|
|
||||||
// Need to always call through the native implementation of
|
// Need to always call through the native implementation of
|
||||||
|
|||||||
Reference in New Issue
Block a user