commit 56bd411d684aeda591ab45cf0c845978139c3d45
author Steven Moreland <smoreland@google.com> Mon Apr 24 17:29:01 2023 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Apr 24 10:29:57 2023 -0700
tree 65a6cb288f063d788eacb18b7421b4299b3b590b
parent c26b28cf2735410d1d03339ab6999f090c50de3b

Merge "libbinder: double cost for incorrect wait config"

GitOrigin-RevId: 58def21db05d386c367f81e6ca1e3804648bf3d0
Change-Id: Idc32eecbc60da1c8a7b313fc2cc686db19a828ac

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 2408307..d4ef0b7 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -412,13 +412,11 @@
             // command, so we hang indefinitely.
             std::unique_lock<std::mutex> lock(waiter->mMutex);
             using std::literals::chrono_literals::operator""s;
-            waiter->mCv.wait_for(lock, 1s, [&] {
-                return waiter->mBinder != nullptr;
-            });
+            waiter->mCv.wait_for(lock, 2s, [&] { return waiter->mBinder != nullptr; });
             if (waiter->mBinder != nullptr) return waiter->mBinder;
         }
 
-        ALOGW("Waited one second for %s (is service started? Number of threads started in the "
+        ALOGW("Waited two seconds for %s (is service started? Number of threads started in the "
               "threadpool: %zu. Are binder threads started and available?)",
               name.c_str(), ProcessState::self()->getThreadPoolMaxTotalThreadCount());