summaryrefslogtreecommitdiff
path: root/runtime/debugger.cc
diff options
context:
space:
mode:
author Sebastien Hertz <shertz@google.com> 2014-10-28 20:30:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-28 20:30:40 +0000
commit1e3926e286b72f53afc84d2e0932ebb7b35a4038 (patch)
treee2696077ae7fff5fc288df561c06a51629ad643d /runtime/debugger.cc
parentadcd83ffb74c6776aab826d6de76fe4aa237db08 (diff)
parenta6e599a8838b7d8098cba12301422e0fb6296753 (diff)
am a6e599a8: Merge "Fix JDWP Virtualmachine.Resume command" into lmp-mr1-dev
* commit 'a6e599a8838b7d8098cba12301422e0fb6296753': Fix JDWP Virtualmachine.Resume command
Diffstat (limited to 'runtime/debugger.cc')
-rw-r--r--runtime/debugger.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index b676c62ee1..1dd68eff2a 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2386,7 +2386,7 @@ void Dbg::SuspendVM() {
}
void Dbg::ResumeVM() {
- Runtime::Current()->GetThreadList()->UndoDebuggerSuspensions();
+ Runtime::Current()->GetThreadList()->ResumeAllForDebugger();
}
JDWP::JdwpError Dbg::SuspendThread(JDWP::ObjectId thread_id, bool request_suspension) {