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

Commit 9c62c4c7 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6 am: ec14d4f1... 

Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6 am: ec14d4f1 am: b92ce720 am: 25af133b

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



Change-Id: I848c42dda6209c49856fd578f609f187d82d19b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a223681 25af133b

cmds/servicemanager/ServiceManager.cpp

+5 −0
Original line number Diff line number Diff line
@@ -700,6 +700,11 @@ Status ServiceManager::registerClientCallback(const std::string& name, const sp< 
        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Couldn't linkToDeath.");

    }



    // make sure all callbacks have been told about a consistent state - b/278038751

    if (serviceIt->second.hasClients) {

        cb->onClients(service, true);

    }



    mNameToClientCallback[name].push_back(cb);



    return Status::ok();