Revert "Revert^2 "Thread suspension cleanup and deadlock fix""

This reverts commit fd20a745227aa7cae7a08728bb29e5bfce64ea87.

Reason for revert: Lots of libartd failures due to new checkpoint lock level check.

Change-Id: I0cf88ff893f8743a9a830a49489807d0921199a3

1 files changed, 1 insertions, 4 deletions

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 969a229660..af365310ef 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -349,10 +349,7 @@ void Dbg::DdmSetThreadNotification(bool enable) {
       Dbg::DdmSendThreadNotification(thread, CHUNK_TYPE("THCR"));
       finish_barrier.Pass(cls_self);
     });
-    // TODO: The above eventually results in calls to EventHandler::DispatchEvent, which does a
-    // ScopedThreadStateChange, which amounts to a thread state change inside the checkpoint run
-    // method. Hence the normal check would fail, and thus we specify Unchecked here.
-    size_t checkpoints = Runtime::Current()->GetThreadList()->RunCheckpointUnchecked(&fc);
+    size_t checkpoints = Runtime::Current()->GetThreadList()->RunCheckpoint(&fc);
     ScopedThreadSuspension sts(self, ThreadState::kWaitingForCheckPointsToRun);
     finish_barrier.Increment(self, checkpoints);
   }