From ebb481d070e3fdbb7950580e6f6886c3231a1ad9 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 19 Mar 2019 09:30:35 +0000 Subject: Revert "Change state to waiting during aborting the VM" This reverts commit 97b964960123d5f215a1cebbce548c8a5322c307. Bug: 127875380 Reason for revert: Broke Dex2oatWatchdogTest.TestWatchdogTrigger on host x86_64 and heap poisoning. Change-Id: Iaebfc4a03543bff4e7239d711dd7ad8c7f880d52 --- runtime/native/java_lang_Thread.cc | 1 - 1 file changed, 1 deletion(-) (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 37b3fe642e..67ad0a47b8 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -104,7 +104,6 @@ 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