summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2017-03-31 03:17:06 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-03-31 03:17:07 +0000
commitbb75449355575a4b1ae72147b80cc7b225092149 (patch)
treef15a9e454ed811ad0ad21ceed62185d74e43c366
parent113ecfe9e714e848f5edc38abea8dc4160c5b220 (diff)
parentd69f82e155118654d989f0b436c019fb6d517341 (diff)
Merge "Change thread suspend timeout to be fatal for non-debug"
-rw-r--r--runtime/thread_list.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index caed36936a..8d72fe80c2 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -736,7 +736,7 @@ void ThreadList::SuspendAllInternal(Thread* self,
// EAGAIN and EINTR both indicate a spurious failure, try again from the beginning.
if ((errno != EAGAIN) && (errno != EINTR)) {
if (errno == ETIMEDOUT) {
- LOG(kIsDebugBuild ? ::android::base::FATAL : ::android::base::ERROR)
+ LOG(::android::base::FATAL)
<< "Timed out waiting for threads to suspend, waited for "
<< PrettyDuration(NanoTime() - start_time);
} else {