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

Merge "HIDL Java: DeadObjectException" am: 628198a90f am: d16ad56f35 am: 6a9695953d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355810

Change-Id: Ia4dac0da412a761cb940a92e4d939c584f19e69c
This commit is contained in:
Steven Moreland
2020-07-08 17:22:52 +00:00
committed by Automerger Merge Worker
parent 4c1a47c212 6a9695953d
commit 5ae197cb8f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/android_os_HwParcel.cpp
View File

@@ -122,10 +122,18 @@ void signalExceptionForError(JNIEnv *env, status_t err, bool canThrowRemoteExcep
std::stringstream ss;
ss << "HwBinder Error: (" << err << ")";
jniThrowException(
env,
canThrowRemoteException ? "android/os/RemoteException" : "java/lang/RuntimeException",
ss.str().c_str());
const char* exception = nullptr;
if (canThrowRemoteException) {
if (err == DEAD_OBJECT) {
exception = "android/os/DeadObjectException";
} else {
exception = "android/os/RemoteException";
}
} else {
exception = "java/lang/RuntimeException";
}
jniThrowException(env, exception, ss.str().c_str());
break;
}