From 5bd09549b443659ddd81768c811dcb5c6850775c Mon Sep 17 00:00:00 2001 From: Alex Light Date: Thu, 9 Feb 2017 16:01:32 -0800 Subject: [PATCH] Let jvmti allow JDWP connections We were incorrectly asserting that the JDWP thread doesn't start until after the kInit runtime phase has passed but this is not necessarily the case if JDWP is started with the runtime. Bug: 35213182 Test: manual Change-Id: Iea325684fa6a4717176ed8f8070fa1d1bb0e18c7 --- runtime/openjdkjvmti/ti_thread.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/openjdkjvmti/ti_thread.cc b/runtime/openjdkjvmti/ti_thread.cc index b18a5cd74..8327b5d16 100644 --- a/runtime/openjdkjvmti/ti_thread.cc +++ b/runtime/openjdkjvmti/ti_thread.cc @@ -78,7 +78,9 @@ struct ThreadCallback : public art::ThreadLifecycleCallback, public art::Runtime if (art::kIsDebugBuild) { std::string name; self->GetThreadName(name); - if (name != "Signal Catcher" && !android::base::StartsWith(name, "Jit thread pool")) { + if (name != "JDWP" && + name != "Signal Catcher" && + !android::base::StartsWith(name, "Jit thread pool")) { LOG(FATAL) << "Unexpected thread before start: " << name; } } -- 2.11.0