Disable new signal handler.

Doesn't play well with existing signal handlers.

Change-Id: Ic93691ad8af14f037bec571a2163bae146741d31

1 files changed, 14 insertions, 12 deletions

diff --git a/runtime/runtime_android.cc b/runtime/runtime_android.cc
index a2377229da..079d7e5900 100644
--- a/runtime/runtime_android.cc
+++ b/runtime/runtime_android.cc
@@ -28,6 +28,7 @@
 namespace art {
 
 static constexpr bool kDumpHeapObjectOnSigsevg = false;
+static constexpr bool kUseSignalHandler = false;
 
 struct sigaction old_action;
 void HandleUnexpectedSignal(int signal_number, siginfo_t* info, void* raw_context) {
@@ -56,18 +57,19 @@ void HandleUnexpectedSignal(int signal_number, siginfo_t* info, void* raw_contex
 }
 
 void Runtime::InitPlatformSignalHandlers() {
-  // On the host, we don't have debuggerd to dump a stack for us when something unexpected happens.
-  struct sigaction action;
-  memset(&action, 0, sizeof(action));
-  sigemptyset(&action.sa_mask);
-  action.sa_sigaction = HandleUnexpectedSignal;
-  // Use the three-argument sa_sigaction handler.
-  action.sa_flags |= SA_SIGINFO;
-  // Use the alternate signal stack so we can catch stack overflows.
-  action.sa_flags |= SA_ONSTACK;
-  int rc = 0;
-  rc += sigaction(SIGSEGV, &action, &old_action);
-  CHECK_EQ(rc, 0);
+  if (kUseSignalHandler) {
+    struct sigaction action;
+    memset(&action, 0, sizeof(action));
+    sigemptyset(&action.sa_mask);
+    action.sa_sigaction = HandleUnexpectedSignal;
+    // Use the three-argument sa_sigaction handler.
+    action.sa_flags |= SA_SIGINFO;
+    // Use the alternate signal stack so we can catch stack overflows.
+    action.sa_flags |= SA_ONSTACK;
+    int rc = 0;
+    rc += sigaction(SIGSEGV, &action, &old_action);
+    CHECK_EQ(rc, 0);
+  }
 }
 
 }  // namespace art