commit cdd798de1b2e7807f1cab8ebbfbb165069beae6b
author Sebastien Hertz <shertz@google.com> Tue Apr 18 18:28:51 2017 +0200
committer Sebastien Hertz <shertz@google.com> Wed Apr 19 10:16:45 2017 +0200
tree 3cd00e41bdc8972936f39e6ec7f3cd262b45fa1e
parent 2203253254e18ebde386740d3c841c04c432a42e

Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14

Test: make -j build-art-host
Change-Id: Id6e81518041bd64dec537ff3da2fa049d39b27d0

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 039b60a..63794bf 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2425,7 +2425,9 @@
   // Suspend thread to build stack trace.
   bool timed_out;
   ThreadList* thread_list = Runtime::Current()->GetThreadList();
-  Thread* thread = thread_list->SuspendThreadByPeer(peer.get(), request_suspension, true,
+  Thread* thread = thread_list->SuspendThreadByPeer(peer.get(),
+                                                    request_suspension,
+                                                    /* debug_suspension */ true,
                                                     &timed_out);
   if (thread != nullptr) {
     return JDWP::ERR_NONE;
@@ -3669,7 +3671,10 @@
           jobject thread_peer = Dbg::GetObjectRegistry()->GetJObject(thread_id);
           bool timed_out;
           ThreadList* const thread_list = Runtime::Current()->GetThreadList();
-          suspended_thread = thread_list->SuspendThreadByPeer(thread_peer, true, true, &timed_out);
+          suspended_thread = thread_list->SuspendThreadByPeer(thread_peer,
+                                                              /* request_suspension */ true,
+                                                              /* debug_suspension */ true,
+                                                              &timed_out);
         }
         if (suspended_thread == nullptr) {
           // Thread terminated from under us while suspending.