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

Commit b9a6b687 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12561555 from 2db4e9e2 to 25Q1-release 

Change-Id: I5becd1465f5606503a1b6e4784a329c3821d2dcd
parents de00ae18 2db4e9e2

libs/binder/BackendUnifiedServiceManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static const char* kStaticCachableList[] = { 
};



bool BinderCacheWithInvalidation::isClientSideCachingEnabled(const std::string& serviceName) {

    if (ProcessState::self()->getThreadPoolMaxTotalThreadCount() <= 0) {

    sp<ProcessState> self = ProcessState::selfOrNull();

    if (!self || self->getThreadPoolMaxTotalThreadCount() <= 0) {

        ALOGW("Thread Pool max thread count is 0. Cannot cache binder as linkToDeath cannot be "

              "implemented. serviceName: %s",

              serviceName.c_str());

libs/binder/IServiceManager.cpp

+7 −4
Original line number Diff line number Diff line
@@ -561,8 +561,9 @@ sp<IBinder> CppBackendShim::getService(const String16& name) const { 
    sp<IBinder> svc = checkService(name);

    if (svc != nullptr) return svc;



    sp<ProcessState> self = ProcessState::selfOrNull();

    const bool isVendorService =

        strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

            self && strcmp(self->getDriverName().c_str(), "/dev/vndbinder") == 0;

    constexpr auto timeout = 5s;

    const auto startTime = std::chrono::steady_clock::now();

    // Vendor code can't access system properties
@@ -579,7 +580,7 @@ sp<IBinder> CppBackendShim::getService(const String16& name) const { 
    const useconds_t sleepTime = gSystemBootCompleted ? 1000 : 100;



    ALOGI("Waiting for service '%s' on '%s'...", String8(name).c_str(),

          ProcessState::self()->getDriverName().c_str());

          self ? self->getDriverName().c_str() : "RPC accessors only");



    int n = 0;

    while (std::chrono::steady_clock::now() - startTime < timeout) {
@@ -661,7 +662,8 @@ sp<IBinder> CppBackendShim::waitForService(const String16& name16) { 
    if (Status status = realGetService(name, &out); !status.isOk()) {

        ALOGW("Failed to getService in waitForService for %s: %s", name.c_str(),

              status.toString8().c_str());

        if (0 == ProcessState::self()->getThreadPoolMaxTotalThreadCount()) {

        sp<ProcessState> self = ProcessState::selfOrNull();

        if (self && 0 == self->getThreadPoolMaxTotalThreadCount()) {

            ALOGW("Got service, but may be racey because we could not wait efficiently for it. "

                  "Threadpool has 0 guaranteed threads. "

                  "Is the threadpool configured properly? "
@@ -695,9 +697,10 @@ sp<IBinder> CppBackendShim::waitForService(const String16& name16) { 
            if (waiter->mBinder != nullptr) return waiter->mBinder;

        }



        sp<ProcessState> self = ProcessState::selfOrNull();

        ALOGW("Waited one second 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());

              name.c_str(), self ? self->getThreadPoolMaxTotalThreadCount() : 0);



        // Handle race condition for lazy services. Here is what can happen:

        // - the service dies (not processed by init yet).

services/powermanager/tests/PowerHalWrapperAidlTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ using aidl::android::hardware::power::IPowerHintSession; 
using aidl::android::hardware::power::Mode;

using aidl::android::hardware::power::SessionConfig;

using aidl::android::hardware::power::SessionTag;

using aidl::android::hardware::power::SupportInfo;

using android::binder::Status;



using namespace android;
@@ -66,7 +65,6 @@ public: 
                (int32_t tgid, int32_t uid, ChannelConfig* _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, closeSessionChannel, (int32_t tgid, int32_t uid), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getHintSessionPreferredRate, (int64_t * rate), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getSupportInfo, (SupportInfo * _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceVersion, (int32_t * version), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceHash, (std::string * hash), (override));

    MOCK_METHOD(ndk::SpAIBinder, asBinder, (), (override));

services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockIPower.h

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ using aidl::android::hardware::power::IPower; 
using aidl::android::hardware::power::IPowerHintSession;

using aidl::android::hardware::power::SessionConfig;

using aidl::android::hardware::power::SessionTag;

using aidl::android::hardware::power::SupportInfo;



using aidl::android::hardware::power::Mode;

using android::binder::Status;
@@ -60,7 +59,6 @@ public: 
    MOCK_METHOD(ndk::ScopedAStatus, getSessionChannel,

                (int32_t tgid, int32_t uid, ChannelConfig* _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, closeSessionChannel, (int32_t tgid, int32_t uid), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getSupportInfo, (SupportInfo * _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceVersion, (int32_t * version), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceHash, (std::string * hash), (override));

    MOCK_METHOD(ndk::SpAIBinder, asBinder, (), (override));