summaryrefslogtreecommitdiff
path: root/runtime/native/java_lang_Thread.cc
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2019-03-19 09:30:35 +0000
committerNicolas Geoffray <ngeoffray@google.com>2019-03-19 12:33:11 +0000
commitebb481d070e3fdbb7950580e6f6886c3231a1ad9 (patch)
treeaf6986daab73dcd17dca5f4bab68024c12c40c83 /runtime/native/java_lang_Thread.cc
parenta1e5b97b4bb4c47c2ab51d8a7d5dd1500d496c4d (diff)
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
Diffstat (limited to 'runtime/native/java_lang_Thread.cc')
-rw-r--r--runtime/native/java_lang_Thread.cc1
1 files changed, 0 insertions, 1 deletions
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.
}