summaryrefslogtreecommitdiffstats
path: root/debuggerd/backtrace.cpp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-11-03 20:23:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-03 20:23:55 +0000
commitd4c7a1cfad22a55d31b6a27b859fb534194fb0e4 (patch)
treebf831c1dc921c1cf1f12dfbcb26bb2b3dc7eb4c2 /debuggerd/backtrace.cpp
parent359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5 (diff)
parenta11ac45536f0722becefccdb6b58378c5d9d0d4b (diff)
downloadsystem_core-d4c7a1cfad22a55d31b6a27b859fb534194fb0e4.zip
system_core-d4c7a1cfad22a55d31b6a27b859fb534194fb0e4.tar.gz
system_core-d4c7a1cfad22a55d31b6a27b859fb534194fb0e4.tar.bz2
am a11ac455: Merge "Fix debuggerd issues."
* commit 'a11ac45536f0722becefccdb6b58378c5d9d0d4b': Fix debuggerd issues.
Diffstat (limited to 'debuggerd/backtrace.cpp')
-rw-r--r--debuggerd/backtrace.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/debuggerd/backtrace.cpp b/debuggerd/backtrace.cpp
index e49ef9b..c2a1dbc 100644
--- a/debuggerd/backtrace.cpp
+++ b/debuggerd/backtrace.cpp
@@ -88,7 +88,9 @@ static void dump_thread(
return;
}
- wait_for_stop(tid, total_sleep_time_usec);
+ if (!attached && wait_for_sigstop(tid, total_sleep_time_usec, detach_failed) == -1) {
+ return;
+ }
UniquePtr<Backtrace> backtrace(Backtrace::Create(tid, BACKTRACE_CURRENT_THREAD));
if (backtrace->Unwind(0)) {