diff options
| author | 2019-10-23 10:40:55 -0700 | |
|---|---|---|
| committer | 2019-10-23 10:40:55 -0700 | |
| commit | db895d51c9d39766bf84b15bb87682a415132e06 (patch) | |
| tree | 1ec87d583b50b09cc4111f400508a1896c127a83 /cmds/servicemanager/ServiceManager.cpp | |
| parent | 1121b1e7bad03ac70cece58cff4de82af7a1ce8c (diff) | |
| parent | 5a308660c3224118a522a748ada47a377800baf7 (diff) | |
Merge changes from topic "orthogonal-sm-retrieval" am: 6d4d056d6b am: f7ead637fb
am: 5a308660c3
Change-Id: I2a3a94c50be8ada4a85bc50847593f568d897c6f
Diffstat (limited to 'cmds/servicemanager/ServiceManager.cpp')
| -rw-r--r-- | cmds/servicemanager/ServiceManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp index 934436847e..934646da41 100644 --- a/cmds/servicemanager/ServiceManager.cpp +++ b/cmds/servicemanager/ServiceManager.cpp @@ -165,7 +165,7 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi #endif // !VENDORSERVICEMANAGER // implicitly unlinked when the binder is removed - if (OK != binder->linkToDeath(this)) { + if (binder->remoteBinder() != nullptr && binder->linkToDeath(this) != OK) { LOG(ERROR) << "Could not linkToDeath when adding " << name; return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE); } |