commit 05e6d30b5398908b2b441bdeaa2bdc220a3ee524
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 10 02:06:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 02:06:43 2017 +0000
tree 5335d89543f9e4053cdb827668320cb4c0d633af
parent 8a8c8ecca3d03ed27d4fc8d5d4f092e74e9c2ca6
parent 5bd09549b443659ddd81768c811dcb5c6850775c

Merge "Let jvmti allow JDWP connections"

runtime/openjdkjvmti/ti_thread.cc

diff --git a/runtime/openjdkjvmti/ti_thread.cc b/runtime/openjdkjvmti/ti_thread.cc
index 00d4144..f8f8fa6 100644
--- a/runtime/openjdkjvmti/ti_thread.cc
+++ b/runtime/openjdkjvmti/ti_thread.cc
@@ -78,7 +78,9 @@
       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;
         }
       }