Merge "binder - include calling PID/UID in uncaught remote exception code" am: ea62c76948
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2510075 Change-Id: If858bd4cd6d19c8a638872d86dc9c7387ed3fea5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -413,9 +413,13 @@ protected:
|
||||
|
||||
if (env->ExceptionCheck()) {
|
||||
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
||||
binder_report_exception(env, excep.get(),
|
||||
"*** Uncaught remote exception! "
|
||||
"(Exceptions are not yet supported across processes.)");
|
||||
|
||||
auto state = IPCThreadState::self();
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -431,6 +435,7 @@ protected:
|
||||
ScopedLocalRef<jthrowable> excep(env, env->ExceptionOccurred());
|
||||
binder_report_exception(env, excep.get(),
|
||||
"*** Uncaught exception in onBinderStrictModePolicyChange");
|
||||
// TODO: should turn this to fatal?
|
||||
}
|
||||
|
||||
// Need to always call through the native implementation of
|
||||
|
||||
Reference in New Issue
Block a user