From 3ea69c0abce1b81b3c45033867d49b00e6d6b709 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 18 Aug 2014 15:38:34 -0700 Subject: [PATCH] AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled. Bug: 17108693 Change-Id: I346cc090e091605c552e5954d7ea1ca4874cea5f --- runtime/runtime.cc | 6 +----- runtime/thread.cc | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 05003cbf2..ba53c4362 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -900,11 +900,7 @@ void Runtime::BlockSignals() { bool Runtime::AttachCurrentThread(const char* thread_name, bool as_daemon, jobject thread_group, bool create_peer) { - bool success = Thread::Attach(thread_name, as_daemon, thread_group, create_peer) != NULL; - if (thread_name == NULL) { - LOG(WARNING) << *Thread::Current() << " attached without supplying a name"; - } - return success; + return Thread::Attach(thread_name, as_daemon, thread_group, create_peer) != NULL; } void Runtime::DetachCurrentThread() { diff --git a/runtime/thread.cc b/runtime/thread.cc index c7cd57d39..dcc897f8f 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -403,6 +403,8 @@ Thread* Thread::Attach(const char* thread_name, bool as_daemon, jobject thread_g if (thread_name != nullptr) { self->tlsPtr_.name->assign(thread_name); ::art::SetThreadName(thread_name); + } else if (self->GetJniEnv()->check_jni) { + LOG(WARNING) << *Thread::Current() << " attached without supplying a name"; } } -- 2.11.0