commit ae4c845b2aadc1e5bc098d54f1ba4914096b9c83
author Mathieu Chartier <mathieuc@google.com> Thu Jun 01 18:45:10 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jun 02 09:31:56 2017 -0700
tree f1da5fba969e751a415f1e3cbe53dbf94b2e35f5
parent 1656ca9e6996cb555b4463e5efd4bd7e3f4fb816

Revert "Change thread suspend timeout to be fatal for non-debug"

For overloaded systems, 10s might not be enough. Infinite seconds
will be though.

Bug: 37221387

Test: test-art-host

This reverts commit d69f82e155118654d989f0b436c019fb6d517341.

(cherry picked from commit 111b0e05d130d345857ad875be484e3839ce25d4)

Change-Id: Id17d94c71360f5de3bb67eb22d05e148dd5238d3

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 3d7b5fe..5094189 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -758,7 +758,7 @@
         // EAGAIN and EINTR both indicate a spurious failure, try again from the beginning.
         if ((errno != EAGAIN) && (errno != EINTR)) {
           if (errno == ETIMEDOUT) {
-            LOG(::android::base::FATAL)
+            LOG(kIsDebugBuild ? ::android::base::FATAL : ::android::base::ERROR)
                 << "Timed out waiting for threads to suspend, waited for "
                 << PrettyDuration(NanoTime() - start_time);
           } else {