commit 18f2ebbd710074d7de6f1e08219e1f4416460465
author Steven Moreland <smoreland@google.com> Tue Aug 13 00:11:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 13 00:11:02 2019 -0700
tree a4d8ade144ffbd643eaf55d3866aae772cfd4369
parent b6cb4068eb9e06584a61865fea2e60cd39c46e3f
parent d09f7faef31ad9cff45b23d7f393da96df7f8f47

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

Change-Id: I3007860fee271305e648fc156a04967a58622dfd

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,