commit 34857b5fd3be5ee8cf1935bd1fbaad37a8e42768
author Koji Fukui <Koji.Fukui@sony.com> Wed Mar 20 19:13:00 2019 +0900
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 27 12:12:13 2019 +0000
tree eabdd26615030bde559d939eb861f02290851c9e
parent 3b45890cf987c0b57965acd78958cd8eca487b8e

Revert "Revert "Change state to waiting during aborting the VM""

This reverts commit ebb481d070e3fdbb7950580e6f6886c3231a1ad9.

Dex2oatWatchdogTest.TestWatchdogTrigger passed.
Apply the change again.

Test: ART_HEAP_POISONING=true make test-art-host-gtest-dex2oat_test64
Bug: 127875380
Change-Id: If4326990cd612815ffe1511490712ca8babfec55

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 26ae38a..3518efd 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2261,6 +2261,7 @@
     case kWaitingPerformingGc:
     case kWaitingWeakGcRootRead:
     case kWaitingForGcThreadFlip:
+    case kNativeForAbort:
     case kWaiting:
       return JDWP::TS_WAIT;
       // Don't add a 'default' here so the compiler can spot incompatible enum changes.