diff options
| author | 2024-12-06 18:39:57 +0000 | |
|---|---|---|
| committer | 2024-12-06 18:39:57 +0000 | |
| commit | ffdc6e00003b6b417fdb06588f395ba97456e232 (patch) | |
| tree | 7acc86e5af8808c60f40e972aad2e68e5980cb35 | |
| parent | 13131184984fd08423260c3591a2df84e377564d (diff) | |
| parent | 728da1622a8404d12d9a6052280c81fd6395a5d0 (diff) | |
Merge "Libbinder cache: ensure binder thread count is checked when removing static list" into main am: c61ebcbdb1 am: 728da1622a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3391696
Change-Id: I13fff528636c8190e5aef1ae372fbcdad4dd7a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/BackendUnifiedServiceManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/BackendUnifiedServiceManager.cpp b/libs/binder/BackendUnifiedServiceManager.cpp index 03d687a9cc..34d5a09948 100644 --- a/libs/binder/BackendUnifiedServiceManager.cpp +++ b/libs/binder/BackendUnifiedServiceManager.cpp @@ -132,6 +132,7 @@ bool BinderCacheWithInvalidation::isClientSideCachingEnabled(const std::string& serviceName.c_str()); return false; } + if (kRemoveStaticList) return true; for (const char* name : kStaticCachableList) { if (name == serviceName) { return true; @@ -175,7 +176,7 @@ Status BackendUnifiedServiceManager::updateCache(const std::string& serviceName, "isBinderAlive_false"); } // If we reach here with kRemoveStaticList=true then we know service isn't lazy - else if (kRemoveStaticList || mCacheForGetService->isClientSideCachingEnabled(serviceName)) { + else if (mCacheForGetService->isClientSideCachingEnabled(serviceName)) { binder::ScopedTrace aidlTrace(ATRACE_TAG_AIDL, "BinderCacheWithInvalidation::updateCache successful"); return mCacheForGetService->setItem(serviceName, binder); |