commit 6fb9949cea76e590b515aff615e8c3c0ba07c118
author Tobias Lindskog <tobias.lindskog@sony.com> Tue Jan 16 10:10:53 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 16 10:10:53 2018 +0000
tree e85e8be90c25661d660d79b4a5aa29cd4a29ff28
parent 599e787bdf2faa29c2365778858118d0cf09b82e
parent 6b80a2706f9b20ccb2698177aa1762e0517bc21c

Merge "Avoid waiting from polling binder threads" am: 29e3092879
am: 6b80a2706f

Change-Id: I3297cbab9d819db117e64a669bd868a02b6b033c

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index ef86f99..4bdeb6e 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -485,8 +485,7 @@
         // that thread, it will block forever because we hung up the one and only
         // binder thread on a condition variable that can only be notified by an
         // incoming binder call.
-        if (ProcessState::self()->getMaxThreads() <= 1 &&
-                IPCThreadState::self()->isLooperThread()) {
+        if (IPCThreadState::self()->isOnlyBinderThread()) {
             LOG(WARNING) << "Can't efficiently wait for " << mInterfaceName << "/"
                          << mInstanceName << ", because we are called from "
                          << "the only binder thread in this process.";