1 files changed, 5 insertions, 0 deletions
diff --git a/vm/jdwp/JdwpEvent.c b/vm/jdwp/JdwpEvent.c
index 69d22373f..371fdda28 100644
--- a/vm/jdwp/JdwpEvent.c
+++ b/vm/jdwp/JdwpEvent.c
@@ -1288,5 +1288,10 @@ void dvmJdwpDdmSendChunkV(JdwpState* state, int type, const struct iovec* iov,
     wrapiov[0].iov_base = header;
     wrapiov[0].iov_len = sizeof(header);
 
+    /*
+     * Make sure we're in VMWAIT in case the write blocks.
+     */
+    int oldStatus = dvmDbgThreadWaiting();
     dvmJdwpSendBufferedRequest(state, wrapiov, iovcnt+1);
+    dvmDbgThreadContinuing(oldStatus);
 }