diff options
| author | 2017-03-20 16:26:42 -0700 | |
|---|---|---|
| committer | 2017-03-23 16:16:53 -0700 | |
| commit | 85a78cff8cbd6477c19ab4c9a21698dddcf0a9f9 (patch) | |
| tree | cee518d7bed60fcc3c4c08603f27500a8d2e6eea /runtime/java_vm_ext.cc | |
| parent | 6efac9929f8952e4871e8c423c923989fc6f2ad2 (diff) | |
Revert^2: "Make sigchain actually own the signal chain.""
This reverts commit 33dca562d5ed9f52f63ced2334c066333ca073e9.
Bug: http://b/36205469
Bug: http://b/36262089
Original-Change-Id: I416b13de800d3e23424cf20688ccfd7e4e48a111
Change-Id: I1267be72c32ed73d1079a572d0b8907556526dde
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index a341cdb89f..b93b8f2a97 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -39,6 +39,7 @@ #include "runtime_options.h" #include "ScopedLocalRef.h" #include "scoped_thread_state_change-inl.h" +#include "sigchain.h" #include "thread-inl.h" #include "thread_list.h" @@ -900,7 +901,8 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, int version = (*jni_on_load)(this, nullptr); if (runtime_->GetTargetSdkVersion() != 0 && runtime_->GetTargetSdkVersion() <= 21) { - fault_manager.EnsureArtActionInFrontOfSignalChain(); + // Make sure that sigchain owns SIGSEGV. + EnsureFrontOfChain(SIGSEGV); } self->SetClassLoaderOverride(old_class_loader.get()); |