From edfdaf37d5520a3c3a858b6b3fba4f759c60dadc Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Fri, 5 Dec 2014 16:12:21 +0000
Subject: Revert "Re-enable one thread dumping the native stack of another."

This reverts commit e652b62c581a3d68b1fc82e0b04e3a59dd633e52.

Change-Id: Ida56d2c23849c1ede82a22100df402877256e270
---
 runtime/utils.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime/utils.cc')

diff --git a/runtime/utils.cc b/runtime/utils.cc
index d9782f3fe..1211547a5 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1125,6 +1125,14 @@ void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix,
     return;
   }
 
+#if !defined(HAVE_ANDROID_OS)
+  if (GetTid() != tid) {
+    // TODO: dumping of other threads is disabled to avoid crashes during stress testing.
+    //       b/15446488.
+    return;
+  }
+#endif
+
   std::unique_ptr<Backtrace> backtrace(Backtrace::Create(BACKTRACE_CURRENT_PROCESS, tid));
   if (!backtrace->Unwind(0)) {
     os << prefix << "(backtrace::Unwind failed for thread " << tid << ")\n";
-- 
cgit v1.2.3