commit d09f7faef31ad9cff45b23d7f393da96df7f8f47
author Steven Moreland <smoreland@google.com> Mon Aug 12 23:24:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 12 23:24:20 2019 -0700
tree 75e813a4a574321f8cd9c7e3ab36d9e1d7711d0c
parent 7e465a9917f5493bca7015aa7da20259757ba2d9
parent f88194161447217a49919e36329cb820023deb82

Merge "servicemanager: rely on auto unlinkToDeath" into stage-aosp-master
am: f881941614

Change-Id: Id3e49ad9ae01110ba3edcc826332195e5d9d624b

cmds/servicemanager/ServiceManager.cpp

diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 5f7dc25..f35f360 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -98,18 +98,12 @@
         return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);
     }
 
+    // implicitly unlinked when the binder is removed
     if (OK != binder->linkToDeath(this)) {
         LOG(ERROR) << "Could not linkToDeath when adding " << name;
         return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);
     }
 
-    auto it = mNameToService.find(name);
-    if (it != mNameToService.end()) {
-        if (OK != it->second.binder->unlinkToDeath(this)) {
-            LOG(WARNING) << "Could not unlinkToDeath when adding " << name;
-        }
-    }
-
     mNameToService[name] = Service {
         .binder = binder,
         .allowIsolated = allowIsolated,