Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8819416 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8587fec4 88860b02

cmds/servicemanager/ServiceManager.cpp

+1 −7
Original line number Diff line number Diff line
@@ -98,18 +98,12 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi 
        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,