| commit | 25af133b3a6249b9414a365e40acb43b2b93ecf2 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 14 18:34:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 14 18:34:42 2023 +0000 |
| tree | 82d3ef0fefe3097d264ca42073dbf1bada094204 | |
| parent | 6a208de56ffab181afea68d1ae1d38c281563c94 [diff] | |
| parent | b92ce72033ff9b3a6cbad9471348e107648d6872 [diff] |
Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6fa am: ec14d4f159 am: b92ce72033 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2537390 Change-Id: I2f34ec0d35cabadf0d1169271dd4f8c50512439d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp index cc8ac0a..63f3821 100644 --- a/cmds/servicemanager/ServiceManager.cpp +++ b/cmds/servicemanager/ServiceManager.cpp
@@ -700,6 +700,11 @@ 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();