summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-04-28 23:47:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-28 23:47:26 +0000
commit325a57218e9f13cf696215006c230cac34b3c8a1 (patch)
treedb58e8ecfb0c491c987f98034947d93f1268fb05 /core/jni
parente861c8eb636bea97c1646cc3bfee1cd32670fe61 (diff)
parent876b7d8fa8c587cccbe11bd30fcdb6c378776420 (diff)
downloadframeworks_base-325a57218e9f13cf696215006c230cac34b3c8a1.zip
frameworks_base-325a57218e9f13cf696215006c230cac34b3c8a1.tar.gz
frameworks_base-325a57218e9f13cf696215006c230cac34b3c8a1.tar.bz2
Merge "Properly describe exception" into mnc-dev
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_util_Binder.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index cfbedda..fb82075 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -200,10 +200,8 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
* that can be made while an exception is pending, so we want to
* get the VM ptr, throw the exception, and then detach the thread.
*/
- JavaVM* vm = jnienv_to_javavm(env);
env->Throw(excep);
- vm->DetachCurrentThread();
- sleep(60);
+ env->ExceptionDescribe();
ALOGE("Forcefully exiting");
exit(1);
}