Merge "servicemanager: rely on auto unlinkToDeath" into stage-aosp-master am: f881941614 (18f2ebbd) · Commits · e / os / android_frameworks_native-old

cmds/servicemanager/ServiceManager.cpp

+1 −7

Original line number	Original line	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);		return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);
	}		}

			// implicitly unlinked when the binder is removed
	if (OK != binder->linkToDeath(this)) {		if (OK != binder->linkToDeath(this)) {
	LOG(ERROR) << "Could not linkToDeath when adding " << name;		LOG(ERROR) << "Could not linkToDeath when adding " << name;
	return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);		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 {		mNameToService[name] = Service {
	.binder = binder,		.binder = binder,
	.allowIsolated = allowIsolated,		.allowIsolated = allowIsolated,