Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffdc6e00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Libbinder cache: ensure binder thread count is checked when removing... 

Merge "Libbinder cache: ensure binder thread count is checked when removing static list" into main am: c61ebcbd am: 728da162

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3391696



Change-Id: I13fff528636c8190e5aef1ae372fbcdad4dd7a18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13131184 728da162

libs/binder/BackendUnifiedServiceManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);