From 34857b5fd3be5ee8cf1935bd1fbaad37a8e42768 Mon Sep 17 00:00:00 2001
From: Koji Fukui <Koji.Fukui@sony.com>
Date: Wed, 20 Mar 2019 19:13:00 +0900
Subject: 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/native/java_lang_Thread.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/native/java_lang_Thread.cc')

diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc
index 67ad0a47b8..37b3fe642e 100644
--- a/runtime/native/java_lang_Thread.cc
+++ b/runtime/native/java_lang_Thread.cc
@@ -104,6 +104,7 @@ static jint Thread_nativeGetStatus(JNIEnv* env, jobject java_thread, jboolean ha
     case kWaitingForVisitObjects:         return kJavaWaiting;
     case kWaitingWeakGcRootRead:          return kJavaRunnable;
     case kWaitingForGcThreadFlip:         return kJavaWaiting;
+    case kNativeForAbort:                 return kJavaWaiting;
     case kSuspended:                      return kJavaRunnable;
     // Don't add a 'default' here so the compiler can spot incompatible enum changes.
   }
-- 
cgit v1.2.3-59-g8ed1b