diff options
author | Devin Moore <devinmoore@google.com> | 2020-08-12 00:20:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-12 00:20:10 +0000 |
commit | b05270227ec22acc6bbaef2a6e66fb208070f4a3 (patch) | |
tree | d76c3a1d1f856b8d2b9bec299d69d9e961141bf4 | |
parent | 13dc90386d1fa423f318559a55895d2afc30cca9 (diff) | |
parent | 26485229358cb240dd2f2f8bf69e13a0885eb822 (diff) | |
download | native-b05270227ec22acc6bbaef2a6e66fb208070f4a3.tar.gz |
Merge "servicemanager: Overwrite old service when a new one is registered" into rvc-qpr-dev
-rw-r--r-- | cmds/servicemanager/ServiceManager.cpp | 7 | ||||
-rw-r--r-- | cmds/servicemanager/test_sm.cpp | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp index 1f9892a262..e80c3210f0 100644 --- a/cmds/servicemanager/ServiceManager.cpp +++ b/cmds/servicemanager/ServiceManager.cpp @@ -213,17 +213,18 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE); } - auto entry = mNameToService.emplace(name, Service { + // Overwrite the old service if it exists + mNameToService[name] = Service { .binder = binder, .allowIsolated = allowIsolated, .dumpPriority = dumpPriority, .debugPid = ctx.debugPid, - }); + }; auto it = mNameToRegistrationCallback.find(name); if (it != mNameToRegistrationCallback.end()) { for (const sp<IServiceCallback>& cb : it->second) { - entry.first->second.guaranteeClient = true; + mNameToService[name].guaranteeClient = true; // permission checked in registerForNotifications cb->onRegistration(name, binder); } diff --git a/cmds/servicemanager/test_sm.cpp b/cmds/servicemanager/test_sm.cpp index 25245beaf7..fb9f9df856 100644 --- a/cmds/servicemanager/test_sm.cpp +++ b/cmds/servicemanager/test_sm.cpp @@ -135,6 +135,26 @@ TEST(AddService, HappyOverExistingService) { IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()); } +TEST(AddService, OverwriteExistingService) { + auto sm = getPermissiveServiceManager(); + sp<IBinder> serviceA = getBinder(); + EXPECT_TRUE(sm->addService("foo", serviceA, false /*allowIsolated*/, + IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()); + + sp<IBinder> outA; + EXPECT_TRUE(sm->getService("foo", &outA).isOk()); + EXPECT_EQ(serviceA, outA); + + // serviceA should be overwritten by serviceB + sp<IBinder> serviceB = getBinder(); + EXPECT_TRUE(sm->addService("foo", serviceB, false /*allowIsolated*/, + IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()); + + sp<IBinder> outB; + EXPECT_TRUE(sm->getService("foo", &outB).isOk()); + EXPECT_EQ(serviceB, outB); +} + TEST(AddService, NoPermissions) { std::unique_ptr<MockAccess> access = std::make_unique<NiceMock<MockAccess>>(); |