Merge "Fix JDWP single-step removal."
diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 6c4d130..52a2141 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2577,7 +2577,7 @@
   MutexLock mu(soa.Self(), *Locks::thread_list_lock_);
   Thread* thread;
   JDWP::JdwpError error = DecodeThread(soa, thread_id, thread);
-  if (error != JDWP::ERR_NONE) {
+  if (error == JDWP::ERR_NONE) {
     SingleStepControl* single_step_control = thread->GetSingleStepControl();
     DCHECK(single_step_control != nullptr);
     single_step_control->is_active = false;