diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-04 11:17:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 11:17:06 +0000 |
| commit | 4cac71c8daf86bf1b6eaa22d41298c4c10de7bbd (patch) | |
| tree | f6ab0adf9438b936ed27c378c30a58fd53d09633 /runtime/jni_internal.cc | |
| parent | 8bf6ac2e5d23b9a876df1a61f061cb954601da3f (diff) | |
| parent | 3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d (diff) | |
| download | art-4cac71c8daf86bf1b6eaa22d41298c4c10de7bbd.tar.gz art-4cac71c8daf86bf1b6eaa22d41298c4c10de7bbd.tar.bz2 art-4cac71c8daf86bf1b6eaa22d41298c4c10de7bbd.zip | |
am 3d7d2af4: Merge "Change how we report exceptions to the debugger."
* commit '3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d':
Change how we report exceptions to the debugger.
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 8c9a3b02ba..9c19d5e2e0 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -465,7 +465,6 @@ class JNI { auto old_throw_method(hs.NewHandle<mirror::ArtMethod>(nullptr)); auto old_exception(hs.NewHandle<mirror::Throwable>(nullptr)); uint32_t old_throw_dex_pc; - bool old_is_exception_reported; { ThrowLocation old_throw_location; mirror::Throwable* old_exception_obj = soa.Self()->GetException(&old_throw_location); @@ -473,7 +472,6 @@ class JNI { old_throw_method.Assign(old_throw_location.GetMethod()); old_exception.Assign(old_exception_obj); old_throw_dex_pc = old_throw_location.GetDexPc(); - old_is_exception_reported = soa.Self()->IsExceptionReportedToInstrumentation(); soa.Self()->ClearException(); } ScopedLocalRef<jthrowable> exception(env, @@ -495,7 +493,6 @@ class JNI { old_throw_dex_pc); soa.Self()->SetException(gc_safe_throw_location, old_exception.Get()); - soa.Self()->SetExceptionReportedToInstrumentation(old_is_exception_reported); } static jthrowable ExceptionOccurred(JNIEnv* env) { |